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

Comments (0)

Files changed (1)


 		if (i == 0)
 			printf("from :%d\n", mark);
-		else if (i == 1)
-			printf("merge :%d", mark);
-			printf(" :%d", mark);
+			printf("merge :%d\n", mark);
-	if (i > 1)
-		printf("\n");
 	rev->diffopt.output_format = saved_output_format;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.