Mercurial > public > mercurial-scm > hg
diff mercurial/simplemerge.py @ 34049:6330df9d6393
simplemerge: remove unused `repo` parameter
This is now no longer used or needed thanks to the `decodeddata()` context
function.
Differential Revision: https://phab.mercurial-scm.org/D602
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Fri, 01 Sep 2017 10:35:43 -0700 |
| parents | 39d253d088a9 |
| children | 93c4958d987c |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Tue Aug 29 18:24:51 2017 +0200 +++ b/mercurial/simplemerge.py Fri Sep 01 10:35:43 2017 -0700 @@ -413,7 +413,7 @@ result[i] = override return result -def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts): +def simplemerge(ui, localctx, basectx, otherctx, **opts): """Performs the simplemerge algorithm. The merged result is written into `localctx`.