diff --git a/tests/test-merge4.out b/tests/test-merge4.out --- a/tests/test-merge4.out +++ b/tests/test-merge4.out @@ -1,15 +1,10 @@ + hg init -+ echo This is file a1 + hg add a -+ hg commit -m 'commit #0' -d '0 0' -+ echo This is file b1 ++ hg commit -m commit #0 -d 0 0 + hg add b -+ hg commit -m 'commit #1' -d '0 0' ++ hg commit -m commit #1 -d 0 0 + hg update 0 -+ echo This is file c1 + hg add c -+ hg commit -m 'commit #2' -d '0 0' ++ hg commit -m commit #2 -d 0 0 + hg update -m 1 -+ rm b -+ echo This is file c22 -+ hg commit -m 'commit #3' -d '0 0' ++ hg commit -m commit #3 -d 0 0