d

mclaughlinconnor · mclaughlinconnor · commit d5017c275a3f · 2024-09-06T20:18:51.000+01:00
diff --git a/src/GitDiff.hx b/src/GitDiff.hx
@@ -50,7 +50,7 @@ class GitDiff {
 
     // If there was a conflict, I need a newline after the last >>>>>>> because it wasn't added in the loop
     if (!isFirst) {
-      formattedString.add("\n");
+      formattedString.add("--\n--");
     }
 
 		currentLine = pushLinesUntil(formattedString, baseLines, currentLine, baseLines.length, false);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class GitDiff {`
`50`	`50`
`51`	`51`	`// If there was a conflict, I need a newline after the last >>>>>>> because it wasn't added in the loop`
`52`	`52`	`if (!isFirst) {`
`53`		`- formattedString.add("\n");`
	`53`	`+ formattedString.add("--\n--");`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`currentLine = pushLinesUntil(formattedString, baseLines, currentLine, baseLines.length, false);`