← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Aaron Bentley
  • Date: 2006-03-10 16:10:04 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060310161004-8e7c784a0ba225de
Switched display functions to conflict_lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
53
53
    """
54
54
    def run(self):
55
55
        from bzrlib.workingtree import WorkingTree
56
 
        for path in WorkingTree.open_containing(u'.')[0].iter_conflicts():
57
 
            print path
 
56
        from transform import conflicts_strings
 
57
        wt = WorkingTree.open_containing(u'.')[0]
 
58
        for conflict in conflicts_strings(wt.conflict_lines()):
 
59
            print conflict
58
60
 
59
61
class cmd_resolve(bzrlib.commands.Command):
60
62
    """Mark a conflict as resolved.