Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 691:61c6b4178b9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
author mpm@selenic.com
date Wed, 13 Jul 2005 01:48:03 -0800
parents f762860f82c6
children fb6f85ecc863 574869103985
comparison
equal deleted inserted replaced
690:f762860f82c6 691:61c6b4178b9e
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 = self.ui.config("ui", "merge") or \ 1501 cmd = os.environ.get("HGMERGE", "hgmerge") or \
1502 os.environ.get("HGMERGE", "hgmerge") 1502 self.ui.config("ui", "merge")
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)