--- a/tests/test-merge-types.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-merge-types.t Wed Nov 25 14:25:26 2015 -0800
@@ -36,7 +36,7 @@
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
preserving a for resolve of a
a: versions differ -> m (premerge)
- picked tool ':merge' for a (binary False symlink True)
+ picked tool ':merge' for a (binary False symlink True changedelete False)
merging a
my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
warning: internal :merge cannot merge symlinks for a
@@ -69,7 +69,7 @@
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
a: versions differ -> m (premerge)
- picked tool ':union' for a (binary False symlink True)
+ picked tool ':union' for a (binary False symlink True changedelete False)
merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :union cannot merge symlinks for a
@@ -92,7 +92,7 @@
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
a: versions differ -> m (premerge)
- picked tool ':merge3' for a (binary False symlink True)
+ picked tool ':merge3' for a (binary False symlink True changedelete False)
merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :merge3 cannot merge symlinks for a
@@ -115,7 +115,7 @@
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
a: versions differ -> m (premerge)
- picked tool ':merge-local' for a (binary False symlink True)
+ picked tool ':merge-local' for a (binary False symlink True changedelete False)
merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :merge-local cannot merge symlinks for a
@@ -137,7 +137,7 @@
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a
a: versions differ -> m (premerge)
- picked tool ':merge-other' for a (binary False symlink True)
+ picked tool ':merge-other' for a (binary False symlink True changedelete False)
merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :merge-other cannot merge symlinks for a
@@ -170,7 +170,7 @@
preserving a for resolve of a
a: versions differ -> m (premerge)
(couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
- picked tool ':prompt' for a (binary False symlink True)
+ picked tool ':prompt' for a (binary False symlink True changedelete False)
no tool found to merge a
keep (l)ocal or take (o)ther? l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved