Mercurial > public > mercurial-scm > hg

diff mercurial/hg.py @ 240:737c66b68290

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace tkmerge with hgmerge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace tkmerge with hgmerge hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch. hg will use hgmerge unless overridden with HGMERGE manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP vYI6qlyWKQZ01ObUTAIg92o= =+mRH -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 18:27:55 -0800
parents fc4a6e5b5812
children afe895fcc0d0
line wrap: on
line diff
--- a/mercurial/hg.py	Fri Jun 03 13:44:34 2005 -0800
+++ b/mercurial/hg.py	Fri Jun 03 18:27:55 2005 -0800
@@ -981,8 +981,8 @@
         self.ui.debug("file %s: other %s ancestor %s\n" %
                               (fn, short(other), short(base)))
 
-        cmd = os.environ["HGMERGE"]
-        r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn))
+        cmd = os.environ.get("HGMERGE", "hgmerge")
+        r = os.system("%s %s %s %s" % (cmd, a, b, c))
         if r:
             self.ui.warn("merging %s failed!\n" % f)