--- a/tests/test-merge-revert.out Fri Mar 31 10:52:56 2006 -0800
+++ b/tests/test-merge-revert.out Sat Apr 01 11:58:50 2006 +0200
@@ -3,7 +3,6 @@
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
-saving current version of file1 as file1.orig
reverting file1
? file1.orig
eb43f19ff115