--- a/tests/test-rename-merge1.out Sun Dec 30 17:36:49 2007 +0100
+++ b/tests/test-rename-merge1.out Sun Dec 30 17:45:26 2007 +0100
@@ -32,7 +32,7 @@
a
M b2
R a
-C c2
+= c2
blahblah
rev offset length base linkrev nodeid p1 p2
0 0 67 0 1 dc51707dfc98 000000000000 000000000000