← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-02-07 15:38:35 UTC
  • mto: This revision was merged to the branch mainline in revision 2272.
  • Revision ID: abentley@panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
Use RegistryOption for merge type

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2301
2301
                             ' you do not need to commit the result.'),
2302
2302
                     ]
2303
2303
 
2304
 
    def help(self):
2305
 
        from inspect import getdoc
2306
 
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2307
 
 
2308
2304
    def run(self, branch=None, revision=None, force=False, merge_type=None,
2309
2305
            show_base=False, reprocess=False, remember=False, 
2310
2306
            uncommitted=False, pull=False):
2438
2434
                     Option('show-base', help="Show base revision text in "
2439
2435
                            "conflicts")]
2440
2436
 
2441
 
    def help(self):
2442
 
        from inspect import getdoc
2443
 
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2444
 
 
2445
2437
    def run(self, file_list=None, merge_type=None, show_base=False,
2446
2438
            reprocess=False):
2447
2439
        if merge_type is None: