--- a/tests/test-double-merge.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-double-merge.t Wed Nov 25 14:25:26 2015 -0800
@@ -38,12 +38,12 @@
preserving foo for resolve of bar
preserving foo for resolve of foo
bar: remote copied from foo -> m (premerge)
- picked tool ':merge' for bar (binary False symlink False)
+ picked tool ':merge' for bar (binary False symlink False changedelete False)
merging foo and bar to bar
my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
premerge successful
foo: versions differ -> m (premerge)
- picked tool ':merge' for foo (binary False symlink False)
+ picked tool ':merge' for foo (binary False symlink False changedelete False)
merging foo
my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
premerge successful