summaryrefslogtreecommitdiff
path: root/t/t4128-apply-root.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-22 16:19:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-23 22:35:13 -0700
commit095ce9538b738db28d5e9a6e05d94c7e3f55f39d (patch)
treef7555f789e822aa73266c354caa4f6cb36fc6578 /t/t4128-apply-root.sh
parentdiff: remove often unused parameters from diff_unmerge() (diff)
downloadtgif-095ce9538b738db28d5e9a6e05d94c7e3f55f39d.tar.xz
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>
Diffstat (limited to 't/t4128-apply-root.sh')
0 files changed, 0 insertions, 0 deletions