merge-recursive: Fix code checking for D/F conflicts still being present
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:57 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:35 +0000 (14:19 -0700)
commitf2507b4...0ef0b7fc8c1e75004e8a86a0430dc512
tree8d5f55c...1b8425d24eee9138517bd219bbb5bf53copy hash to clipboard (tree)
parentf0fd4d0...e8a17fe5ccdd4d3edd686bc6702b8144copy hash to clipboard (diff)
merge-recursive.c