phillco updated this revision to Diff 1042. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D382?vs=863&id=1042 REVISION DETAIL https://phab.mercurial-scm.org/D382 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py --- a/mercurial/simplemerge.py +++ b/mercurial/simplemerge.py @@ -419,13 +419,10 @@ return [name_a, name_b, name_base] -def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None, - **opts): +def simplemerge(ui, localctx, basectx, otherctx, repo=None, **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`. """ def readctx(ctx): if not ctx: To: phillco, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
