Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- 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