Patchwork D1641: py3: handle keyword arguments correctly in simplemerge.py

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2017, 2:51 a.m.
Message ID <a960523d1742b6e220f0e6b7e0434648@localhost.localdomain>
Download mbox | patch
Permalink /patch/26185/
State Not Applicable
Headers show

Comments

phabricator - Dec. 10, 2017, 2:51 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG93c4958d987c: py3: handle keyword arguments correctly in simplemerge.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1641?vs=4320&id=4332

REVISION DETAIL
  https://phab.mercurial-scm.org/D1641

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -418,6 +418,8 @@ 
 
     The merged result is written into `localctx`.
     """
+    opts = pycompat.byteskwargs(opts)
+
     def readctx(ctx):
         # Merges were always run in the working copy before, which means
         # they used decoded data, if the user defined any repository