unison/unison-src/transcripts/fix2000.md

Checks that squash and merge do the same thing, with nontrivial history that includes a merge conflict.

.> builtins.merge

x.a.p = "af"
x.a.q = "ef"

.> add
.> fork x y
.> fork x s
.> fork x m
.> delete.verbose y.a.p

y.a.p = "fij"

.> add

y.b.p = "wie"

Merge back into the ancestor.

.> add
.> merge y.b y.a
.> delete.term.verbose 1
.> merge y m
.> squash y s
.s> todo
.m> todo