diff tests/test-merge3.out @ 801:1f9ec150a476

Updated output of tests.

--- a/tests/test-merge3.out	Fri Jul 29 15:19:43 2005 +0100
+++ b/tests/test-merge3.out	Fri Jul 29 15:21:02 2005 +0100
@@ -1,11 +1,8 @@
 + hg init
-+ echo This is file a1
 + hg add a
-+ hg commit -m 'commit #0' -d '0 0'
-+ touch b
++ hg commit -m commit #0 -d 0 0
 + hg add b
-+ rm b
-+ hg commit -A '-mcomment #1' -d '0 0'
-adding .out
++ hg commit -A -mcomment #1 -d 0 0
 removing b
 b never committed!
+nothing changed