~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6103
6103
    """
6104
6104
    takes_options = ['directory',
6105
6105
                     Option('ignored', help='Delete all ignored files.'),
6106
 
                     Option('detritus', help='Delete conflict files, merge'
 
6106
                     Option('detritus', help='Delete conflict files, merge and revert'
6107
6107
                            ' backups, and failed selftest dirs.'),
6108
6108
                     Option('unknown',
6109
6109
                            help='Delete files unknown to bzr (default).'),