Mercurial > hg
diff mercurial/merge.py @ 46794:e2f7b2695ba1
merge with stable
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 18 Mar 2021 18:24:59 -0400 |
parents | dc00324e80f4 39f23d20ea47 |
children | 5a0b930cfb3e |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Mar 02 00:05:22 2021 +0100 +++ b/mercurial/merge.py Thu Mar 18 18:24:59 2021 -0400 @@ -20,6 +20,7 @@ nullrev, ) from .thirdparty import attr +from .utils import stringutil from . import ( copies, encoding, @@ -1343,7 +1344,7 @@ except OSError as inst: repo.ui.warn( _(b"update failed to remove %s: %s!\n") - % (f, pycompat.bytestr(inst.strerror)) + % (f, stringutil.forcebytestr(inst.strerror)) ) if i == 100: yield i, f