← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
62
62
            option.Option('text',
63
63
                          help='List paths of files with text conflicts.'),
64
64
        ]
65
 
    _see_also = ['resolve']
 
65
    _see_also = ['resolve', 'conflict-types']
66
66
 
67
67
    def run(self, text=False):
68
68
        wt = workingtree.WorkingTree.open_containing(u'.')[0]