aboutsummaryrefslogtreecommitdiff
path: root/Main.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Main.hs')
-rw-r--r--Main.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Main.hs b/Main.hs
index d86a6cb..c3e18c9 100644
--- a/Main.hs
+++ b/Main.hs
@@ -156,6 +156,11 @@ isKeepTok _ = False
isDelTok (Del, _) = True
isDelTok _ = False
+-- TODO: Diff output is not necessarily deterministic; we could make the chunk
+-- sequences more unique by rolling them to front (or back), possibly enabling
+-- more conflict resolution and preventing mismerges.
+--
+-- Example: " a " can be made out of " {+a +}" or "{+ a+} "
chunks :: [(Op, String)] -> [Merged]
chunks [] = []
chunks xs@((Keep, _):_) =