# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1498477846 -19800
# Node ID 9fc880dff5f35a8d64da8abf4de782c0555e213a
# Parent  4c5af472a5994d5996ebf557820059d9fca8e1ab
py3: use hex() to convert the hash to bytes

diff -r 4c5af472a599 -r 9fc880dff5f3 mercurial/merge.py
--- a/mercurial/merge.py	Sat Jun 24 19:57:50 2017 +0530
+++ b/mercurial/merge.py	Mon Jun 26 17:20:46 2017 +0530
@@ -414,7 +414,7 @@
         if fcl.isabsent():
             hash = nullhex
         else:
-            hash = hashlib.sha1(fcl.path()).hexdigest()
+            hash = hex(hashlib.sha1(fcl.path()).digest())
             self._repo.vfs.write('merge/' + hash, fcl.data())
         self._state[fd] = ['u', hash, fcl.path(),
                            fca.path(), hex(fca.filenode()),