summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-25 11:55:40 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-28 00:08:29 -0800
commite228340961e0f48c6b818251bd4729b2d19647e4 (patch)
tree6b8ddfd4744d9682e5de667768d27f74c9737fef /combine-diff.c
parent5290a0f8129cc5830390bad3cc6c8034cb23b41c (diff)
downloadgit-e228340961e0f48c6b818251bd4729b2d19647e4.tar.gz
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>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c5
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