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 c7fa84bffb07504890259fca1b05bd499847e1fe..5d43be60a46624283a47797bdc97c65aa6cf6dbe 100644 (file)
--- 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;