From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 27 Apr 2005 00:48:57 +0000 (-0700)
Subject: diff-cache.c: use the "U <pathname>" format for unmerged entries.
X-Git-Tag: v0.99~732
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5cd7e16205f29c757ccd925d3f6ac8b5e6cc553;p=git.git

diff-cache.c: use the "U <pathname>" format for unmerged entries.

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

diff --git a/diff-cache.c b/diff-cache.c
index c7fa84bff..5d43be60a 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;