--- a/tests/test-merge-revert2.out	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-merge-revert2.out	Mon Apr 16 20:17:39 2007 -0300
@@ -9,7 +9,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 f248da0d4c3e tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging file1
 merging file1 failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved