--- a/tests/test-issue672.t Thu Jan 24 23:57:44 2013 +0100
+++ b/tests/test-issue672.t Thu Jan 24 23:57:44 2013 +0100
@@ -66,7 +66,7 @@
overwrite: False, partial: False
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
1a: local copied/moved to 1 -> m
- preserving 1a for resolve of 1a
+ preserving 1a for resolve of 1a
updating: 1a 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1a and 1 to 1a
@@ -89,7 +89,7 @@
overwrite: False, partial: False
ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
1: remote moved to 1a -> m
- preserving 1 for resolve of 1a
+ preserving 1 for resolve of 1a
removing 1
updating: 1 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)