--- a/tests/test-issue672.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-issue672.t Wed Nov 25 14:25:26 2015 -0800
@@ -66,7 +66,7 @@
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
preserving 1a for resolve of 1a
1a: local copied/moved from 1 -> m (premerge)
- picked tool ':merge' for 1a (binary False symlink False)
+ picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1a and 1 to 1a
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
premerge successful
@@ -89,7 +89,7 @@
preserving 1 for resolve of 1a
removing 1
1a: remote moved from 1 -> m (premerge)
- picked tool ':merge' for 1a (binary False symlink False)
+ picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
premerge successful