--- a/tests/test-double-merge.t Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-double-merge.t Sun Oct 11 21:56:39 2015 -0700
@@ -37,12 +37,12 @@
ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
preserving foo for resolve of bar
preserving foo for resolve of foo
- bar: remote copied from foo -> m
+ bar: remote copied from foo -> m (premerge)
picked tool ':merge' for bar (binary False symlink False)
merging foo and bar to bar
my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
premerge successful
- foo: versions differ -> m
+ foo: versions differ -> m (premerge)
picked tool ':merge' for foo (binary False symlink False)
merging foo
my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc