--- a/tests/test-merge-commit.t Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-merge-commit.t Sun Oct 11 21:56:39 2015 -0700
@@ -72,7 +72,7 @@
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
preserving bar for resolve of bar
- bar: versions differ -> m
+ bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False)
merging bar
my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
@@ -158,7 +158,7 @@
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
preserving bar for resolve of bar
- bar: versions differ -> m
+ bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False)
merging bar
my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9