diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c index eb763e113b..b0846bc09b 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -386,7 +386,6 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent) else putchar(' '); } - putchar(' '); puts(ll->line); ll = ll->next; } @@ -396,7 +395,7 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent) else putchar('+'); } - printf(" %.*s\n", sl->len, sl->bol); + printf("%.*s\n", sl->len, sl->bol); } } } @@ -503,7 +502,7 @@ int diff_tree_combined_merge(const unsigned char *sha1, for (p = paths; p; p = p->next) { if (!p->len) continue; - printf("diff --combined "); + printf("diff --%s ", dense ? "cc" : "combined"); if (quote_c_style(p->path, NULL, NULL, 0)) quote_c_style(p->path, NULL, stdout, 0); else |