diff --git a/combine-diff.c b/combine-diff.c
index 984103edce04d6313009ad4e7755c9eea3bf52e6..a23894d86927ccf3fcf4a9c720df49ff2364b749 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
if (header) {
shown_header++;
- puts(header);
+ printf("%s%c", header, opt->line_termination);
}
printf("diff --%s ", dense ? "cc" : "combined");
if (quote_c_style(elem->path, NULL, NULL, 0))
@@ -799,7 +799,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, const cha
inter_name_termination = 0;
if (header)
- puts(header);
+ printf("%s%c", header, line_termination);
for (i = 0; i < num_parent; i++) {
if (p->parent[i].mode)