diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:48:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:48:57 -0700 |
| commit | a5cd7e16205f29c757ccd925d3f6ac8b5e6cc553 (patch) | |
| tree | 91049c40f86a1434aebb2fd7b18497363cec2621 | |
| parent | [PATCH] diff-cache/tree compatible output for show-diff (take 2). (diff) | |
| download | tgif-a5cd7e16205f29c757ccd925d3f6ac8b5e6cc553.tar.xz | |
diff-cache.c: use the "U <pathname>" format for unmerged entries.
This makes it match "show-diff" behaviour.
| -rw-r--r-- | diff-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c index c7fa84bffb..5d43be60a4 100644 --- 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; |