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: NJunio C Hamano <junkio@cox.net>

Fixed to do the right thing at the end.
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>