diff --git a/tests/test-merge-commit b/tests/test-merge-commit --- a/tests/test-merge-commit +++ b/tests/test-merge-commit @@ -1,9 +1,6 @@ #!/bin/sh # check that renames are correctly saved by a commit after a merge -HGMERGE=merge -export HGMERGE - # test with the merge on 3 having the rename on the local parent hg init a cd a