From 554429b9b1f39b09cfef8dc3654f806655547a2a Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Thu, 17 Jul 2025 15:53:30 +0200 Subject: expand README --- Main.hs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Main.hs') 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, _):_) = -- cgit v1.2.3