diff options
| author | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-17 15:53:30 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <miroslav.kratochvil@uni.lu> | 2025-07-17 15:53:30 +0200 |
| commit | 554429b9b1f39b09cfef8dc3654f806655547a2a (patch) | |
| tree | 15e2a88630535365f124372ebb4a623c460426b0 /Main.hs | |
| parent | 44bd3e8c149f923aa82da77da03db3be13bca83e (diff) | |
| download | werge-554429b9b1f39b09cfef8dc3654f806655547a2a.tar.gz werge-554429b9b1f39b09cfef8dc3654f806655547a2a.tar.bz2 | |
expand README
Diffstat (limited to 'Main.hs')
| -rw-r--r-- | Main.hs | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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, _):_) = |