← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 02:48:41 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4965.
  • Revision ID: andrew.bennetts@canonical.com-20100112024841-vbudg5ayivfzcwok
Merge lp:bzr, resolving NEWS conflict.

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