/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge bzr.dev and resolve conflits. (good use case for an enhanced merge
algorithm, many conflits should at least be presented in a better way).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3536
3536
            help='Message to use when committing this merge')
3537
3537
        ]
3538
3538
 
 
3539
    encoding_type = 'exact'
 
3540
 
3539
3541
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3540
3542
            sign=False, revision=None, mail_to=None, message=None):
3541
3543
        from bzrlib.revision import ensure_null, NULL_REVISION