combine-diff: minor output changes.

diff --git a/combine-diff.c b/combine-diff.c
index eb763e113b12fb10990ce1041d89870762ed520f..b0846bc09bd2dc2c63f7ec702ac021e192606d93 100644 (file)
--- 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