File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -428,8 +428,8 @@ working index HEAD target working index HEAD
428
428
429
429
`reset --merge` is meant to be used when resetting out of a conflicted
430
430
merge. Any mergy operation guarantees that the working tree file that is
431
- involved in the merge does not have local change wrt the index before
432
- it starts, and that it writes the result out to the working tree. So if
431
+ involved in the merge does not have a local change with respect to the index
432
+ before it starts, and that it writes the result out to the working tree. So if
433
433
we see some difference between the index and the target and also
434
434
between the index and the working tree, then it means that we are not
435
435
resetting out from a state that a mergy operation left after failing
You can’t perform that action at this time.
0 commit comments