Mercurial > hg

changeset 35368:93c4958d987c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: handle keyword arguments correctly in simplemerge.py Differential Revision: https://phab.mercurial-scm.org/D1641
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 10 Dec 2017 04:48:24 +0530
parents 6eee2bcc57c4
children c8ecd96cc357
files mercurial/simplemerge.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Sun Dec 10 04:48:12 2017 +0530
+++ b/mercurial/simplemerge.py	Sun Dec 10 04:48:24 2017 +0530
@@ -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