projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b32ff0
)
diff-cache.c: use the "U <pathname>" format for unmerged entries.
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 00:48:57 +0000
(17:48 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 00:48:57 +0000
(17:48 -0700)
This makes it match "show-diff" behaviour.
diff-cache.c
patch
|
blob
|
history
diff --git
a/diff-cache.c
b/diff-cache.c
index
c7fa84b
..
5d43be6
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;