equal
deleted
inserted
replaced
417 if len(overrides) > 3: |
417 if len(overrides) > 3: |
418 raise error.Abort(_("can only specify three labels.")) |
418 raise error.Abort(_("can only specify three labels.")) |
419 |
419 |
420 return [name_a, name_b, name_base] |
420 return [name_a, name_b, name_base] |
421 |
421 |
422 def simplemerge(ui, localfile, basefile, otherfile, |
422 def simplemerge(ui, localctx=None, basectx=None, otherctx=None, repo=None, |
423 localctx=None, basectx=None, otherctx=None, repo=None, **opts): |
423 **opts): |
424 """Performs the simplemerge algorithm. |
424 """Performs the simplemerge algorithm. |
425 |
425 |
426 {local|base|other}ctx are optional. If passed, they (local/base/other) will |
426 {local|base|other}ctx are optional. If passed, they (local/base/other) will |
427 be read from and the merge result written to (local). You should pass |
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. |
428 explicit labels in this mode since the default is to use the file paths. |