--- a/tests/test-merge-commit.t Thu May 15 02:14:59 2014 +0200
+++ b/tests/test-merge-commit.t Tue Apr 22 02:10:25 2014 +0200
@@ -71,8 +71,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
+ preserving bar for resolve of bar
bar: versions differ -> m
- preserving bar for resolve of bar
updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar
@@ -158,8 +158,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
+ preserving bar for resolve of bar
bar: versions differ -> m
- preserving bar for resolve of bar
updating: bar 1/1 files (100.00%)
picked tool 'internal:merge' for bar (binary False symlink False)
merging bar