← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Martin Pool
  • Date: 2007-07-10 10:33:45 UTC
  • mto: This revision was merged to the branch mainline in revision 2599.
  • Revision ID: mbp@sourcefrog.net-20070710103345-hwfpnzxcx1mfv31x
Also check that option help ends in a period, and fix those that don't

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
89
89
    """
90
90
    aliases = ['resolved']
91
91
    takes_args = ['file*']
92
 
    takes_options = [Option('all', help='Resolve all conflicts in this tree')]
 
92
    takes_options = [
 
93
            Option('all', help='Resolve all conflicts in this tree.'),
 
94
            ]
93
95
    def run(self, file_list=None, all=False):
94
96
        from bzrlib.workingtree import WorkingTree
95
97
        if all: