equal
deleted
inserted
replaced
1822 def merge3(self, fn, my, other, p1, p2): |
1822 def merge3(self, fn, my, other, p1, p2): |
1823 """perform a 3-way merge in the working directory""" |
1823 """perform a 3-way merge in the working directory""" |
1824 |
1824 |
1825 def temp(prefix, node): |
1825 def temp(prefix, node): |
1826 pre = "%s~%s." % (os.path.basename(fn), prefix) |
1826 pre = "%s~%s." % (os.path.basename(fn), prefix) |
1827 (fd, name) = tempfile.mkstemp("", pre) |
1827 (fd, name) = tempfile.mkstemp(prefix=pre) |
1828 f = os.fdopen(fd, "wb") |
1828 f = os.fdopen(fd, "wb") |
1829 self.wwrite(fn, fl.read(node), f) |
1829 self.wwrite(fn, fl.read(node), f) |
1830 f.close() |
1830 f.close() |
1831 return name |
1831 return name |
1832 |
1832 |