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

This makes it match "show-diff" behaviour.
git-mirror · Apr 27, 2005 · a5cd7e1 · a5cd7e1
1 parent 0b32ff0
commit a5cd7e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;