diff --git a/mercurial/hg.py b/mercurial/hg.py index 9a2075c0b9b8b50784f9313027654fdfe0c2b442_bWVyY3VyaWFsL2hnLnB5..aa9a0d50e6124941031bd519af7fa94bc54110c4_bWVyY3VyaWFsL2hnLnB5 100644 --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -769,7 +769,7 @@ if co == cn: cn = -1 edittext = "\nHG: merge resolve\n" + \ - "HG: manifest hash %s\n" % hex(mnode) + \ + "HG: manifest hash %s\n" % hex(node) + \ "".join(["HG: changed %s\n" % f for f in new]) edittext = self.ui.edit(edittext) n = self.changelog.add(node, new, edittext, tr, co, cn) @@ -834,7 +834,7 @@ def between(self, pairs): n = "\n".join(["-".join(map(hex, p)) for p in pairs]) d = self.do_cmd("between", pairs=n).read() - p = [ map(bin, l.split(" ")) for l in d.splitlines() ] + p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] return p def changegroup(self, nodes):