diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out
--- a/tests/test-merge-revert.out
+++ b/tests/test-merge-revert.out
@@ -3,18 +3,18 @@ 0:eb43f19ff115
 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