show-diff: don't print out the full "ce" format for unmerged files
It really doesn't make sense, since there are potentially _many_ different cache entries for an unmerged file. So just do the "U pathname" thing.
This commit is contained in:
parent
0a7668e99f
commit
b8a55ce71d
@ -72,7 +72,7 @@ int main(int argc, char **argv)
|
||||
continue;
|
||||
|
||||
if (ce_stage(ce)) {
|
||||
show_file("U", ce);
|
||||
printf("U %s%c", ce->name, line_termination);
|
||||
|
||||
while (i < entries &&
|
||||
!strcmp(ce->name, active_cache[i]->name))
|
||||
|
Loading…
Reference in New Issue
Block a user