--- a/tests/test-merge-revert.out	Fri Mar 31 10:37:25 2006 -0800
+++ b/tests/test-merge-revert.out	Fri Mar 31 10:52:56 2006 -0800
@@ -3,18 +3,18 @@
 016807e6fdaf tip
 eb43f19ff115
 eb43f19ff115+
-saving current version of file1 as file1.bak
+saving current version of file1 as file1.orig
 reverting file1
-? file1.bak
+? file1.orig
 eb43f19ff115
-? file1.bak
+? file1.orig
 016807e6fdaf tip
 merging file1
-? file1.bak
+? file1.orig
 016807e6fdaf tip
-? file1.bak
+? file1.orig
 016807e6fdaf tip
-? file1.bak
+? file1.orig
 016807e6fdaf tip
-? file1.bak
+? file1.orig
 016807e6fdaf tip