# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1518583078 18000
# Node ID 187f2474bc117848692176eeb8e33ae68494fe2d
# Parent  0836c70ba5fa21855da8084a69ef1433d3d97185
merge: coerce nodes to bytes, not str

Differential Revision: https://phab.mercurial-scm.org/D2250

diff -r 0836c70ba5fa -r 187f2474bc11 mercurial/merge.py
--- 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: