Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 12:49:19 +0000 (05:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 10 Apr 2007 19:55:51 +0000 (12:55 -0700)
commit4c4caaf...9cef1031beb46babe9adfdcc03f3cd52
tree0a15dd4...bef36ecd2c14198cbddd503fc65396d7copy hash to clipboard (tree)
parentea4b52a...6f6b6b8e5aef8e47fb557f37422512bfcopy hash to clipboard (diff)
unpack-trees.c