Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 36177 187f2474bc11
parent 36142 60dd840a7fdb
child 36316 759579bac31d 
--- a/mercurial/merge.py	Tue Feb 13 19:12:44 2018 -0500
+++ b/mercurial/merge.py	Tue Feb 13 23:37:58 2018 -0500
@@ -1846,7 +1846,7 @@
             else:
                 pas = [p1.ancestor(p2, warn=branchmerge)]
 
-        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
+        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)
 
         ### check phase
         if not overwrite:
mercurial