Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 703:fb6f85ecc863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 17:28:19 +0100
parents 61c6b4178b9e
children 574869103985
comparison
equal deleted inserted replaced
702:a1099c50a622 703:fb6f85ecc863
1496 1496
1497 self.ui.note("resolving %s\n" % fn) 1497 self.ui.note("resolving %s\n" % fn)
1498 self.ui.debug("file %s: other %s ancestor %s\n" % 1498 self.ui.debug("file %s: other %s ancestor %s\n" %
1499 (fn, short(other), short(base))) 1499 (fn, short(other), short(base)))
1500 1500
1501 cmd = os.environ.get("HGMERGE", "hgmerge") or \ 1501 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
1502 self.ui.config("ui", "merge") 1502 or "hgmerge")
1503 r = os.system("%s %s %s %s" % (cmd, a, b, c)) 1503 r = os.system("%s %s %s %s" % (cmd, a, b, c))
1504 if r: 1504 if r:
1505 self.ui.warn("merging %s failed!\n" % fn) 1505 self.ui.warn("merging %s failed!\n" % fn)
1506 1506
1507 os.unlink(b) 1507 os.unlink(b)