--- a/tests/test-merge-types.t Thu May 15 02:14:59 2014 +0200
+++ b/tests/test-merge-types.t Tue Apr 22 02:10:25 2014 +0200
@@ -34,8 +34,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
+ preserving a for resolve of a
a: versions differ -> m
- preserving a for resolve of a
updating: a 1/1 files (100.00%)
picked tool 'internal:merge' for a (binary False symlink True)
merging a
@@ -68,8 +68,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
+ preserving a for resolve of a
a: versions differ -> m
- preserving a for resolve of a
updating: a 1/1 files (100.00%)
picked tool 'internal:merge' for a (binary False symlink True)
merging a
@@ -102,8 +102,8 @@
resolving manifests
branchmerge: False, force: False, partial: False
ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
+ preserving a for resolve of a
a: versions differ -> m
- preserving a for resolve of a
updating: a 1/1 files (100.00%)
(couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
picked tool 'internal:prompt' for a (binary False symlink True)