# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1602260267 25200
# Node ID ed0ded64a8a9a477023b82a21264d4df34fc3dc5
# Parent  223296268c4e2105b031666d2159b94b8b53a2e0
py3: convert an exception message to bytes

One of our users ran into this (unrelated to my recent work on
more specific errors).

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

diff -r 223296268c4e -r ed0ded64a8a9 mercurial/merge.py
--- a/mercurial/merge.py	Fri Oct 09 08:08:54 2020 -0700
+++ b/mercurial/merge.py	Fri Oct 09 09:17:47 2020 -0700
@@ -1309,7 +1309,8 @@
             wctx[f].remove(ignoremissing=True)
         except OSError as inst:
             repo.ui.warn(
-                _(b"update failed to remove %s: %s!\n") % (f, inst.strerror)
+                _(b"update failed to remove %s: %s!\n")
+                % (f, pycompat.bytestr(inst.strerror))
             )
         if i == 100:
             yield i, f