--- a/tests/test-rename-merge2.out	Sat Jul 10 21:23:00 2010 +0200
+++ b/tests/test-rename-merge2.out	Fri Jul 30 10:32:24 2010 +0300
@@ -15,12 +15,12 @@
  a: remote copied to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
-update: a 1/2 files (50.00%)
+updating: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
  premerge successful
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
@@ -50,14 +50,14 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 getting a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
  premerge successful
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
@@ -87,12 +87,12 @@
 preserving a for resolve of b
 preserving rev for resolve of rev
 removing a
-update: a 1/2 files (50.00%)
+updating: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
  premerge successful
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -120,12 +120,12 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: b 1/2 files (50.00%)
+updating: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
  premerge successful
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
@@ -152,9 +152,9 @@
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
-update: b 1/2 files (50.00%)
+updating: b 1/2 files (50.00%)
 getting b
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
@@ -180,7 +180,7 @@
  ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
-update: rev 1/1 files (100.00%)
+updating: rev 1/1 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
@@ -208,11 +208,11 @@
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 removing a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 getting b
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -237,7 +237,7 @@
  ancestor 924404dff337 local 02963e448370+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
-update: rev 1/1 files (100.00%)
+updating: rev 1/1 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
@@ -259,11 +259,11 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: b 1/2 files (50.00%)
+updating: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
@@ -293,13 +293,13 @@
  rev: versions differ -> m
  c: remote created -> g
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 warning: detected divergent renames of a to:
  b
  c
-update: c 2/3 files (66.67%)
+updating: c 2/3 files (66.67%)
 getting c
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
@@ -322,11 +322,11 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: b 1/2 files (50.00%)
+updating: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
@@ -350,13 +350,13 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 removing a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -379,13 +379,13 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 getting a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
@@ -409,13 +409,13 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 removing a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -438,13 +438,13 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 getting a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
@@ -467,11 +467,11 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: b 1/2 files (50.00%)
+updating: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
@@ -497,13 +497,13 @@
  a: prompt recreating -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
+updating: a 1/3 files (33.33%)
 getting a
-update: b 2/3 files (66.67%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
@@ -529,12 +529,12 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: a 1/3 files (33.33%)
-update: b 2/3 files (66.67%)
+updating: a 1/3 files (33.33%)
+updating: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
@@ -563,11 +563,11 @@
 preserving a for resolve of b
 preserving rev for resolve of rev
 removing a
-update: a 1/2 files (50.00%)
+updating: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
@@ -595,11 +595,11 @@
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: b 1/2 files (50.00%)
+updating: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
-update: rev 2/2 files (100.00%)
+updating: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
@@ -630,14 +630,14 @@
  c: remote created -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
-update: b 1/3 files (33.33%)
+updating: b 1/3 files (33.33%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
  premerge successful
-update: c 2/3 files (66.67%)
+updating: c 2/3 files (66.67%)
 getting c
-update: rev 3/3 files (100.00%)
+updating: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337