Mercurial > public > mercurial-scm > hg

comparison mercurial/simplemerge.py @ 33906:fa6309c5761d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: stop accepting, and passing, file parameters Differential Revision: https://phab.mercurial-scm.org/D381
author Phil Cohen <phillco@fb.com>
date Thu, 24 Aug 2017 21:30:51 -0700
parents 61b267a99fea
children 1ad3085239ad
comparison
equal deleted inserted replaced
33905:61b267a99fea 33906:fa6309c5761d
417 if len(overrides) > 3: 417 if len(overrides) > 3:
418 raise error.Abort(_("can only specify three labels.")) 418 raise error.Abort(_("can only specify three labels."))
419 419
420 return [name_a, name_b, name_base] 420 return [name_a, name_b, name_base]
421 421
422 def simplemerge(ui, localfile, basefile, otherfile, 422 def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None,
423 localctx=None, basectx=None, otherctx=None, repo=None, **opts): 423 **opts):
424 """Performs the simplemerge algorithm. 424 """Performs the simplemerge algorithm.
425 425
426 {local|base|other}ctx are optional. If passed, they (local/base/other) will 426 {local|base|other}ctx are optional. If passed, they (local/base/other) will
427 be read from and the merge result written to (local). You should pass 427 be read from and the merge result written to (local). You should pass
428 explicit labels in this mode since the default is to use the file paths. 428 explicit labels in this mode since the default is to use the file paths.