diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Aug 2011 18:39:10 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Aug 2011 19:05:47 +0000 (12:05 -0700)
commit9969454...358b74c14982f2b9769f8804f017672c
tree22d10c5...840ee9a7f9de07ff1da88cb06ea49a91copy hash to clipboard (tree)
parent206af7c...6b134b4962fa04fa174a25f29efd7e5ecopy hash to clipboard (diff)
combine-diff.c