Commits

Anonymous committed 6abf189 Merge

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
builtin-fast-export: Only output a single parent per line

  • Participants
  • Parent commits 20bd3b0, 5070b49

Comments (0)

Files changed (1)

File builtin-fast-export.c

 			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;