combine-diff: minor output changes.
Remove extra whitespace between the change indicators and the body text. That is more in line with the uncombined unified diff output (pointed out by Santi Bejar). When showing --cc, say so instead of saying just --combined. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 25, 2006 at 11:55 UTC
e228340961e0f48c6b818251bd4729b2d19647e4
1 file changed
+2
-3
combine-diff.c
+2
-3
@@ -386,7 +386,6 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent)
386
else
387
putchar(' ');
388
}
389
- putchar(' ');
389
puts(ll->line);
390
ll = ll->next;
391
}
@@ -396,7 +395,7 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent)
395
else
396
putchar('+');
397
}
399
- printf(" %.*s\n", sl->len, sl->bol);
398
+ printf("%.*s\n", sl->len, sl->bol);
399
}
400
}
401
}
@@ -503,7 +502,7 @@ int diff_tree_combined_merge(const unsigned char *sha1,
502
for (p = paths; p; p = p->next) {
503
if (!p->len)
504
continue;
506
- printf("diff --combined ");
505
+ printf("diff --%s ", dense ? "cc" : "combined");
506
if (quote_c_style(p->path, NULL, NULL, 0))
507
quote_c_style(p->path, NULL, stdout, 0);
508
else