Mercurial > hg
changeset 36177:187f2474bc11
merge: coerce nodes to bytes, not str
Differential Revision: https://phab.mercurial-scm.org/D2250
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 13 Feb 2018 23:37:58 -0500 |
| parents | 0836c70ba5fa |
| children | 646002338365 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: