diff-cache.c: use the "U <pathname>" format for unmerged entries.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 00:48:57 +0000 (17:48 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 00:48:57 +0000 (17:48 -0700)
commita5cd7e16205f29c757ccd925d3f6ac8b5e6cc553
tree91049c40f86a1434aebb2fd7b18497363cec2621
parent0b32ff0dd99136719f0977ba1470894d6d3ab430
diff-cache.c: use the "U <pathname>" format for unmerged entries.

This makes it match "show-diff" behaviour.
diff-cache.c