From a5cd7e16205f29c757ccd925d3f6ac8b5e6cc553 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 26 Apr 2005 17:48:57 -0700
Subject: [PATCH] diff-cache.c: use the "U <pathname>" format for unmerged
entries.
This makes it match "show-diff" behaviour.
---
diff-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff-cache.c b/diff-cache.c
index c7fa84bffb0..5d43be60a46 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -77,7 +77,7 @@ static void remove_merge_entries(void)
struct cache_entry *ce = active_cache[i];
if (!ce_stage(ce))
continue;
- printf("%s: unmerged\n", ce->name);
+ printf("U %s%c", ce->name, line_termination);
while (remove_entry_at(i)) {
if (!ce_stage(active_cache[i]))
break;