Scott Taylor 42b390bbc4 git: use merged parent tree for git index ... Instead of setting the index to match the tree of HEAD, we now set the index to the merged parent tree of the working copy commit. This means that if you edit a merge commit, it will make the Git index look like it would in the middle of a `git merge` operation (with all of the successfully-merged files staged in the index). If there are any 2-sided conflicts in the merged parent tree, then they will be added to the index as conflicts. Since Git doesn't support conflicts with more than 2 sides, many-sided conflicts are staged as the first side of the conflict. The following commit will improve this.		2025-01-06 19:17:51 -06:00
..
examples	examples: use settings_for_new_workspace() when initializing workspace	2025-01-06 21:15:28 +09:00
src	git: use gix instead of git2 to update index	2025-01-06 19:17:51 -06:00
testing	merge_tools: add "$marker_length" variable	2024-12-23 08:42:10 -06:00
tests	git: use merged parent tree for git index	2025-01-06 19:17:51 -06:00
build.rs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
Cargo.toml	cli: add test that runs basic jj commands with minimal configuration	2025-01-04 17:54:28 +09:00
docs	build: fix cargo publish by symlinking cli/docs->docs	2024-11-05 17:37:14 -08:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00