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

  • Committer: Ian Clatworthy
  • Date: 2010-01-03 01:41:00 UTC
  • mto: (4944.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4945.
  • Revision ID: ian.clatworthy@canonical.com-20100103014100-7240p8r4tl347nrj
conflicts topic renamed to conflict-types and other minor help clean-ups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
58
58
            Option('text',
59
59
                   help='List paths of files with text conflicts.'),
60
60
        ]
61
 
    _see_also = ['resolve']
 
61
    _see_also = ['resolve', 'conflict-types']
62
62
 
63
63
    def run(self, text=False):
64
64
        from bzrlib.workingtree import WorkingTree