# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-02-14 04:37:58
# Node ID 187f2474bc117848692176eeb8e33ae68494fe2d
# Parent  0836c70ba5fa21855da8084a69ef1433d3d97185

merge: coerce nodes to bytes, not str

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

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1846,7 +1846,7 @@ def update(repo, node, branchmerge, forc
             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: