Re: [PATCH 4/6] am --abort: revert changes introduced by failed 3way merge

Paul Tan writes: > Even when a merge conflict occurs with am --3way, the index will be > modified with the results of any successfully merged files. These > changes to the index will not be reverted with a > "git read-tree --reset -u HEAD ORIG_HEAD", as git read-tree will not be > aware of how th

[PATCH 4/6] am --abort: revert changes introduced by failed 3way merge

Even when a merge conflict occurs with am --3way, the index will be modified with the results of any successfully merged files. These changes to the index will not be reverted with a "git read-tree --reset -u HEAD ORIG_HEAD", as git read-tree will not be aware of how the current index differs from