diff --git a/tests/test-merge4 b/tests/test-merge4 --- a/tests/test-merge4 +++ b/tests/test-merge4 @@ -11,7 +11,7 @@ hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "1000000 0" -hg update -m 1 +hg merge 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "1000000 0"