diff -r 4e44ca05a866 -r c4d577262d00 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Mar 10 23:34:36 2006 -0800
+++ b/mercurial/localrepo.py	Sat Mar 11 21:33:19 2006 -0800
@@ -1702,9 +1702,8 @@
 
         cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
                or "hgmerge")
-        r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c),
-                        environ={'HG_ROOT': self.root,
-                                 'HG_FILE': fn,
+        r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=self.root,
+                        environ={'HG_FILE': fn,
                                  'HG_MY_NODE': p1,
                                  'HG_OTHER_NODE': p2,
                                  'HG_FILE_MY_NODE': hex(my),