| commit | 095ce9538b738db28d5e9a6e05d94c7e3f55f39d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Apr 2011 23:19:27 +0000 (22 16:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Apr 2011 05:35:13 +0000 (23 22:35 -0700) | ||
| tree | f7555f789e822aa73266c354caa4f6cb36fc6578 | treesnapshot (tar.gz zip) |
| parent | fa7b290895ba2c4407ae818911ba620eaca53bbd | commitdiff |
diff-files: show unmerged entries correctly
Earlier, e9c8409 (diff-index --cached --raw: show tree entry on the LHS
for unmerged entries., 2007-01-05) taught the command to show the object
name and the mode from the entry coming from the tree side when comparing
a tree with an unmerged index.
This is a belated companion patch that teaches diff-files to show the mode
from the entry coming from the working tree side, when comparing an
unmerged index and the working tree.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Earlier, e9c8409 (diff-index --cached --raw: show tree entry on the LHS
for unmerged entries., 2007-01-05) taught the command to show the object
name and the mode from the entry coming from the tree side when comparing
a tree with an unmerged index.
This is a belated companion patch that teaches diff-files to show the mode
from the entry coming from the working tree side, when comparing an
unmerged index and the working tree.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff-lib.c | diffblobblamehistory | |
| t/t4046-diff-unmerged.sh | [new file with mode: 0755] | blob |