Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 240:737c66b68290
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 |
comparison
equal
deleted
inserted
replaced
239:75840796e8e2 | 240:737c66b68290 |
---|---|
979 | 979 |
980 self.ui.note("resolving %s\n" % fn) | 980 self.ui.note("resolving %s\n" % fn) |
981 self.ui.debug("file %s: other %s ancestor %s\n" % | 981 self.ui.debug("file %s: other %s ancestor %s\n" % |
982 (fn, short(other), short(base))) | 982 (fn, short(other), short(base))) |
983 | 983 |
984 cmd = os.environ["HGMERGE"] | 984 cmd = os.environ.get("HGMERGE", "hgmerge") |
985 r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn)) | 985 r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
986 if r: | 986 if r: |
987 self.ui.warn("merging %s failed!\n" % f) | 987 self.ui.warn("merging %s failed!\n" % f) |
988 | 988 |
989 os.unlink(b) | 989 os.unlink(b) |
990 os.unlink(c) | 990 os.unlink(c) |