Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 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 6330df9d6393
children f0b6fbea00cf
comparison
equal deleted inserted replaced
35367:6eee2bcc57c4 35368:93c4958d987c
416 def simplemerge(ui, localctx, basectx, otherctx, **opts): 416 def simplemerge(ui, localctx, basectx, otherctx, **opts):
417 """Performs the simplemerge algorithm. 417 """Performs the simplemerge algorithm.
418 418
419 The merged result is written into `localctx`. 419 The merged result is written into `localctx`.
420 """ 420 """
421 opts = pycompat.byteskwargs(opts)
422
421 def readctx(ctx): 423 def readctx(ctx):
422 # Merges were always run in the working copy before, which means 424 # Merges were always run in the working copy before, which means
423 # they used decoded data, if the user defined any repository 425 # they used decoded data, if the user defined any repository
424 # filters. 426 # filters.
425 # 427 #