merge-recursive: do not barf on "to be removed" entries.
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 12:52:57 +0000 (05:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 10 Apr 2007 19:55:51 +0000 (12:55 -0700)
commitac7f0f4...6e4f45d616ca509f5163fddab104516b
treef8187e8...b8088d1dd912716a398524c8e6bde308copy hash to clipboard (tree)
parent4c4caaf...9cef1031beb46babe9adfdcc03f3cd52copy hash to clipboard (diff)
merge-recursive.c