tests/test-merge-revert.out
changeset 2029 d436b21b20dc
parent 1933 7544700fd931
child 2030 8d9ec30d58bc
--- a/tests/test-merge-revert.out	Fri Mar 31 03:25:35 2006 -0600
+++ b/tests/test-merge-revert.out	Fri Mar 31 10:37:25 2006 -0800
@@ -3,10 +3,18 @@
 016807e6fdaf tip
 eb43f19ff115
 eb43f19ff115+
+saving current version of file1 as file1.bak
+reverting file1
+? file1.bak
 eb43f19ff115
+? file1.bak
 016807e6fdaf tip
 merging file1
+? file1.bak
 016807e6fdaf tip
+? file1.bak
 016807e6fdaf tip
+? file1.bak
 016807e6fdaf tip
+? file1.bak
 016807e6fdaf tip