diff-cache.c: use the "U <pathname>" format for unmerged entries.
This makes it match "show-diff" behaviour.
This commit is contained in:
parent
0b32ff0dd9
commit
a5cd7e1620
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user