--- a/tests/test-issue672.out Sat Jul 10 21:23:00 2010 +0200
+++ b/tests/test-issue672.out Fri Jul 30 10:32:24 2010 +0300
@@ -13,9 +13,9 @@
ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
1: other deleted -> r
1a: remote created -> g
-update: 1 1/2 files (50.00%)
+updating: 1 1/2 files (50.00%)
removing 1
-update: 1a 2/2 files (100.00%)
+updating: 1a 2/2 files (100.00%)
getting 1a
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -33,7 +33,7 @@
ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
1a: local copied/moved to 1 -> m
preserving 1a for resolve of 1a
-update: 1a 1/1 files (100.00%)
+updating: 1a 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1a and 1 to 1a
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
@@ -53,7 +53,7 @@
1: remote moved to 1a -> m
preserving 1 for resolve of 1a
removing 1
-update: 1 1/1 files (100.00%)
+updating: 1 1/1 files (100.00%)
picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d