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
..
benches
gen-protos
proc-macros
src	git: use merged parent tree for git index	2025-01-06 19:17:51 -06:00
tests	git: use merged parent tree for git index	2025-01-06 19:17:51 -06:00
testutils	tests: add convenient method to initialize TestWorkspace with test settings	2025-01-06 22:37:33 +09:00
Cargo.toml	config: load system host/user name by CLI and insert as env-base layer	2025-01-04 17:54:28 +09:00
LICENSE