diff -r 1386a9cffc88 -r 93a4e72b4f83 tests/run-tests.py --- a/tests/run-tests.py Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/run-tests.py Sat Apr 28 17:55:45 2007 -0300 @@ -346,8 +346,9 @@ HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' -os.environ["HGMERGE"] = 'python "%s"' % os.path.join(TESTDIR, os.path.pardir, - 'contrib', 'simplemerge') +os.environ["HGMERGE"] = ('python "%s" -L my -L other' + % os.path.join(TESTDIR, os.path.pardir, 'contrib', + 'simplemerge')) os.environ["HGUSER"] = "test" os.environ["HGENCODING"] = "ascii" os.environ["HGENCODINGMODE"] = "strict"