/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/commands.py

Merge Aarons conflict plugin for 0.1rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
355
355
    'root':                   str,
356
356
    'no-backup':              None,
357
357
    'pattern':                str,
 
358
    'remember':               None,
358
359
    }
359
360
 
360
361
SHORT_OPTIONS = {