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)
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>
No differences found