changeset 6004 | 5af5f0f9d724 |
parent 5807 | 4dfe7d5b1fc8 |
child 6208 | c88b9e597588 |
--- a/tests/run-tests.py Sun Feb 03 19:29:05 2008 -0600 +++ b/tests/run-tests.py Sun Feb 03 19:29:05 2008 -0600 @@ -420,9 +420,7 @@ HGRCPATH = None os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' -os.environ["HGMERGE"] = ('python "%s" -L my -L other' - % os.path.join(TESTDIR, os.path.pardir, - 'contrib', 'simplemerge')) +os.environ["HGMERGE"] = "internal:merge" os.environ["HGUSER"] = "test" os.environ["HGENCODING"] = "ascii" os.environ["HGENCODINGMODE"] = "strict"