fix: separator line

IacopoSb · IacopoSb · commit 8778257b6cb8 · 2026-01-26T20:55:35.000+01:00
diff --git a/src/ViewModels/MergeConflictEditor.cs b/src/ViewModels/MergeConflictEditor.cs
@@ -486,16 +486,16 @@ private void BuildAlignedResultPanel()
                         // First line: start marker (use real marker from file)
                         resultLines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, currentRegion.StartMarker, 0, 0));
 
-                        // Second line: separator marker
-                        resultLines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, currentRegion.SeparatorMarker, 0, 0));
-
                         // Mine content lines (matches the deleted lines in Ours panel)
                         foreach (var line in currentRegion.OursContent)
                         {
                             resultLines.Add(new Models.TextDiffLine(
                                 Models.TextDiffLineType.Deleted, line, 0, resultLineNumber++));
                         }
 
+                        // Separator marker between Mine and Theirs
+                        resultLines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, currentRegion.SeparatorMarker, 0, 0));
+
                         // Theirs content lines (matches the added lines in Theirs panel)
                         foreach (var line in currentRegion.TheirsContent)
                         {

Original file line number	Diff line number	Diff line change
`@@ -486,16 +486,16 @@ private void BuildAlignedResultPanel()`
`486`	`486`	`// First line: start marker (use real marker from file)`
`487`	`487`	`resultLines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, currentRegion.StartMarker, 0, 0));`
`488`	`488`
`489`		`- // Second line: separator marker`
`490`		`- resultLines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, currentRegion.SeparatorMarker, 0, 0));`
`491`		`-`
`492`	`489`	`// Mine content lines (matches the deleted lines in Ours panel)`
`493`	`490`	`foreach (var line in currentRegion.OursContent)`
`494`	`491`	`{`
`495`	`492`	`resultLines.Add(new Models.TextDiffLine(`
`496`	`493`	`Models.TextDiffLineType.Deleted, line, 0, resultLineNumber++));`
`497`	`494`	`}`
`498`	`495`
	`496`	`+ // Separator marker between Mine and Theirs`
	`497`	`+ resultLines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, currentRegion.SeparatorMarker, 0, 0));`
	`498`	`+`
`499`	`499`	`// Theirs content lines (matches the added lines in Theirs panel)`
`500`	`500`	`foreach (var line in currentRegion.TheirsContent)`
`501`	`501`	`{`