mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This makes it match "show-diff" behaviour.
This commit is contained in:
Linus Torvalds
2005-04-26 17:48:57 -07:00
parent 0b32ff0dd9
commit a5cd7e1620
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff-cache.c
View File

@ -77,7 +77,7 @@ static void remove_merge_entries(void)
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = active_cache[i];
if (!ce_stage(ce)) if (!ce_stage(ce))
continue; continue;
printf("%s: unmerged\n", ce->name); printf("U %s%c", ce->name, line_termination);
while (remove_entry_at(i)) { while (remove_entry_at(i)) {
if (!ce_stage(active_cache[i])) if (!ce_stage(active_cache[i]))
break; break;