--- a/tests/test-subrepo.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-subrepo.t Wed Nov 25 14:25:26 2015 -0800
@@ -297,11 +297,11 @@
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
preserving t for resolve of t
t: versions differ -> m (premerge)
- picked tool ':merge' for t (binary False symlink False)
+ picked tool ':merge' for t (binary False symlink False changedelete False)
merging t
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
t: versions differ -> m (merge)
- picked tool ':merge' for t (binary False symlink False)
+ picked tool ':merge' for t (binary False symlink False changedelete False)
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved