merge-recursive: handle D/F conflict case more carefully.
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 13:41:13 +0000 (06:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 10 Apr 2007 19:55:51 +0000 (12:55 -0700)
commit4d50895...390658bf1b9a9385dbc0b9f90b48c803
tree78c791b...717cd240d7c900b77ad572c62b637526copy hash to clipboard (tree)
parentac7f0f4...6e4f45d616ca509f5163fddab104516bcopy hash to clipboard (diff)
merge-recursive.c