--- a/tests/test-merge5.out
+++ b/tests/test-merge5.out
@@ -1,20 +1,12 @@
-+ mkdir t
-+ cd t
 + hg init
-+ echo This is file a1
-+ echo This is file b1
 + hg add a b
-+ hg commit -m 'commit #0' -d '0 0'
-+ echo This is file b22
-+ hg commit '-mcomment #1' -d '0 0'
++ hg commit -m commit #0 -d 0 0
++ hg commit -mcomment #1 -d 0 0
 + hg update 0
-+ rm b
-+ hg commit -A '-mcomment #2' -d '0 0'
++ hg commit -A -mcomment #2 -d 0 0
 removing b
-+ yes k
 + hg update 1
 this update spans a branch affecting the following files:
  b
 aborting update spanning branches!
 (use update -m to perform a branch merge)
-+ exit 0