added-lines feature changed to only support safe case when recognize …

…both sides added lines before and after

src/Resolution.hs

@@ -37,19 +37,11 @@ resolveGenLines opts sides@(Sides a base b) =
     _ | opts.addedLines ->
         case addedBothSides a b <> addedBothSides b a of
         [x] -> Just x
-        _ ->
-            case res a b <> res b a of
-            [x] -> Just x
-            _ -> Nothing
+        _ -> Nothing
     _ -> Nothing
     where
         n = length base
         addedBothSides x y = [x <> drop n y | drop (length x - n) x == base && take n y == base]
-        res x y =
-            [y <> drop n x | take n x == base] <>
-            [take initLen x <> y | drop initLen x == base]
-            where
-                initLen = length x - n
 
 resolveConflict :: ResolutionOptions -> Conflict -> Resolution
 resolveConflict opts c

src/ResolutionOpts.hs

@@ -25,7 +25,8 @@ parser =
         "Convert tabs to the spaces at the tab stops for the given tab size"
         (\x -> "Disable converting tabs to " <> show x <> " spaces at the tab stops")
     <*> OptUtils.envSwitch "line-endings" True "line-ending characters conflict resolution"
-    <*> OptUtils.envSwitch "added-lines" False "added lines resolution (EXPERIMENTAL)"
+    <*> 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"
 
 isResolving :: ResolutionOptions -> Bool