summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuiltin-fast-export.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e1c56303e5..4ab93fcf78 100755
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
continue;
if (i == 0)
printf("from :%d\n", mark);
- else if (i == 1)
- printf("merge :%d", mark);
else
- printf(" :%d", mark);
+ printf("merge :%d\n", mark);
i++;
}
- if (i > 1)
- printf("\n");
log_tree_diff_flush(rev);
rev->diffopt.output_format = saved_output_format;