t / t4101 / diff.0-2on commit merge-tree: use ll_merge() not xdl_merge() (15b4f7a)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file