Merge branch 'maint-1.5.4' into maint

[git.git] / builtin-fast-export.c

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e1c56303e5cb7882bc79980c4f8e6c6791ad323b..4ab93fcf780c100f9af3bb6d4ddf3cbe86f73b3d 100755 (executable)
--- 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;