changeset 33906 | fa6309c5761d |
parent 33905 | 61b267a99fea |
child 33907 | 1ad3085239ad |
--- a/mercurial/simplemerge.py Thu Aug 24 21:30:37 2017 -0700 +++ b/mercurial/simplemerge.py Thu Aug 24 21:30:51 2017 -0700 @@ -419,8 +419,8 @@ return [name_a, name_b, name_base] -def simplemerge(ui, localfile, basefile, otherfile, - localctx=None, basectx=None, otherctx=None, repo=None, **opts): +def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None, + **opts): """Performs the simplemerge algorithm. {local|base|other}ctx are optional. If passed, they (local/base/other) will