equal
deleted
inserted
replaced
774 b = temp("remote", other) |
774 b = temp("remote", other) |
775 c = temp("parent", base) |
775 c = temp("parent", base) |
776 |
776 |
777 cmd = os.environ["HGMERGE"] |
777 cmd = os.environ["HGMERGE"] |
778 self.ui.debug("invoking merge with %s\n" % cmd) |
778 self.ui.debug("invoking merge with %s\n" % cmd) |
779 r = os.system("%s %s %s %s" % (cmd, a, b, c)) |
779 r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn)) |
780 if r: |
780 if r: |
781 raise "Merge failed!" |
781 raise "Merge failed!" |
782 |
782 |
783 text = open(a).read() |
783 text = open(a).read() |
784 os.unlink(a) |
784 os.unlink(a) |