diff-files: show unmerged entries correctly
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Apr 2011 23:19:27 +0000 (16:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Apr 2011 05:35:13 +0000 (22:35 -0700)
commit095ce95...8b738db28d5e9a6e05d94c7e3f55f39d
treef7555f7...9e822aa73266c354caa4f6cb36fc6578copy hash to clipboard (tree)
parentfa7b290...95ba2c4407ae818911ba620eaca53bbdcopy hash to clipboard (diff)
diff-lib.c
t/t4046-diff-unmerged.sh [new file with mode: 0755]