diff --git a/tests/test-merge3 b/tests/test-merge3 --- a/tests/test-merge3 +++ b/tests/test-merge3 @@ -3,8 +3,8 @@ hg init echo This is file a1 > a hg add a -hg commit -t "commit #0" -d "0 0" -u user +hg commit -m "commit #0" -d "0 0" touch b hg add b rm b -hg commit -A -t"comment #1" -d "0 0" -u user +hg commit -A -m"comment #1" -d "0 0"