--- a/tests/test-merge-criss-cross.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-merge-criss-cross.t Wed Nov 25 14:25:26 2015 -0800
@@ -83,11 +83,11 @@
f1: remote is newer -> g
getting f1
f2: versions differ -> m (premerge)
- picked tool ':dump' for f2 (binary False symlink False)
+ picked tool ':dump' for f2 (binary False symlink False changedelete False)
merging f2
my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c
f2: versions differ -> m (merge)
- picked tool ':dump' for f2 (binary False symlink False)
+ picked tool ':dump' for f2 (binary False symlink False changedelete False)
my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon