--- a/tests/test-graft.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-graft.t Wed Nov 25 14:25:26 2015 -0800
@@ -154,7 +154,7 @@
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
preserving b for resolve of b
b: local copied/moved from a -> m (premerge)
- picked tool ':merge' for b (binary False symlink False)
+ picked tool ':merge' for b (binary False symlink False changedelete False)
merging b and a to b
my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
premerge successful
@@ -184,11 +184,11 @@
getting d
b: remote unchanged -> k
e: versions differ -> m (premerge)
- picked tool ':merge' for e (binary False symlink False)
+ picked tool ':merge' for e (binary False symlink False changedelete False)
merging e
my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
e: versions differ -> m (merge)
- picked tool ':merge' for e (binary False symlink False)
+ picked tool ':merge' for e (binary False symlink False changedelete False)
my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue