• Junio C Hamano's avatar
    diff-files: show unmerged entries correctly · 095ce953
    Junio C Hamano authored
    Earlier, e9c84099 (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: default avatarJunio C Hamano <gitster@pobox.com>
    095ce953
t4046-diff-unmerged.sh 2.07 KB