Handle more conflict layouts

walles · Oct 19, 2024 · 1355279 · 1355279
1 parent 8579ced
commit 1355279
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/conflicts_highlighter.rs b/src/conflicts_highlighter.rs
@@ -103,7 +103,7 @@ impl LinesHighlighter for ConflictsHighlighter {
 
         let prefixes = if self.c1_header.starts_with("++") {
             // Possible content line prefixes when doing "git diff"
-            vec!["+ ", "++", " +", " -", "- "]
+            vec!["+ ", "++", " +", " -", "- ", "  "]
         } else {
             vec![""]
         };