From 3ce3c1d8936b122fd9777db77bbbc289b127eeec Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Sun, 13 Jul 2025 00:06:05 +0200
Subject: zeal and resolution evasion works

---
 Opts.hs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'Opts.hs')

diff --git a/Opts.hs b/Opts.hs
index 1bdcbe1..bc76360 100644
--- a/Opts.hs
+++ b/Opts.hs
@@ -64,6 +64,9 @@ data Config = Config
   , cfgLabelMyOld :: String
   , cfgLabelOldYour :: String
   , cfgLabelEnd :: String
+  , cfgResolveSpaces :: Bool
+  , cfgResolveOverlaps :: Bool
+  , cfgResolveSeparate :: Bool
   } deriving (Show)
 
 config = do
@@ -123,9 +126,13 @@ config = do
           <> value ">>>>>"
           <> showDefault
           <> help "label for end of the conflict"
-  -- TODO also should support -3 "only merge non-overlapping changes", -x "only
-  -- merge overlapping changes" and something that doesn't merge anything at
-  -- all (maybe better have negative flags?)
+  cfgResolveOverlaps <-
+    fmap not . switch
+      $ long "conflict-overlaps" <> help "do not resolve overlapping changes"
+  cfgResolveSeparate <-
+    fmap not . switch
+      $ long "conflict-separate"
+          <> help "do not resolve separate (non-overlapping) changes"
   pure Config {..}
 
 data Command
-- 
cgit v1.2.3