diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -419,13 +419,11 @@ return [name_a, name_b, name_base] -def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None, +def simplemerge(ui, localctx, basectx, otherctx, repo=None, filtereddata=False, **opts): """Performs the simplemerge algorithm. - {local|base|other}ctx are optional. If passed, they (local/base/other) will - be read from and the merge result written to (local). You should pass - explicit labels in this mode since the default is to use the file paths. + The merged result is written into `localctx`. filtereddata should only be True if the data() in your context returns decoded data.