diff --git a/tests/test-merge4.out b/tests/test-merge4.out --- a/tests/test-merge4.out +++ b/tests/test-merge4.out @@ -1,10 +0,0 @@ -+ hg init -+ hg add a -+ hg commit -m commit #0 -d 0 0 -+ hg add b -+ hg commit -m commit #1 -d 0 0 -+ hg update 0 -+ hg add c -+ hg commit -m commit #2 -d 0 0 -+ hg update -m 1 -+ hg commit -m commit #3 -d 0 0