--- a/tests/test-merge-commit.t Thu Jan 24 23:57:44 2013 +0100
+++ b/tests/test-merge-commit.t Thu Jan 24 23:57:44 2013 +0100
@@ -72,7 +72,7 @@
overwrite: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
bar: versions differ -> m
- preserving bar for resolve of bar
+ 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
@@ -159,7 +159,7 @@
overwrite: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
bar: versions differ -> m
- preserving bar for resolve of bar
+ 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