Commit c4e3cca1 authored by Committed by Linus Torvalds
[PATCH] update-cache --remove marks the path merged.
When update-cache --remove is run, resolve unmerged state for the path. This is consistent with the update-cache --add behaviour. Essentially, the user is telling us how he wants to resolve the merge by running update-cache. Signed-off-by: Junio C Hamano <[email protected]> Fixed to do the right thing at the end. Signed-off-by: Linus Torvalds <[email protected]>
Showing with 3 additions and 1 deletion