提交 b8a55ce7 编写于 作者: L Linus Torvalds

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.
上级 0a7668e9
......@@ -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))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册