##// END OF EJS Templates
simplemerge: make context parameters non-optional...
Phil Cohen -
r33908:1ad30852 default
parent child Browse files
Show More
@@ -419,13 +419,10 b' def _picklabels(defaults, overrides):'
419
419
420 return [name_a, name_b, name_base]
420 return [name_a, name_b, name_base]
421
421
422 def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None,
422 def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
423 **opts):
424 """Performs the simplemerge algorithm.
423 """Performs the simplemerge algorithm.
425
424
426 {local|base|other}ctx are optional. If passed, they (local/base/other) will
425 The merged result is written into `localctx`.
427 be read from and the merge result written to (local). You should pass
428 explicit labels in this mode since the default is to use the file paths.
429 """
426 """
430 def readctx(ctx):
427 def readctx(ctx):
431 if not ctx:
428 if not ctx:
General Comments 0
You need to be logged in to leave comments. Login now