split-markers enabled by default

(following discussion with Eyal)
Peaker · Nov 16, 2024 · 5950a47 · 5950a47
1 parent e04b3a8
commit 5950a47
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ResolutionOpts.hs b/src/ResolutionOpts.hs
@@ -28,7 +28,7 @@ parser =
     <*> OptUtils.envSwitch "line-endings" True "line-ending characters conflict resolution"
     <*> OptUtils.envSwitch "lines-added-around" False
         "resolve conflicts where one change prepended lines to the base and the other appended"
-    <*> OptUtils.envSwitch "split-markers" False "split conflicts at tilde-split-markers"
+    <*> OptUtils.envSwitch "split-markers" True "split conflicts at tilde-split-markers"
     <*> OptUtils.envSwitch "indentation" False "indentation conflict resolution"
 
 isResolving :: ResolutionOptions -> Bool