← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to conflicts.py

  • Committer: Aaron Bentley
  • Date: 2005-09-19 02:44:11 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20050919024411-8bb9efa8c13c7c44
Updated to match API changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
41
41
    files.)
42
42
    """
43
43
    def run(self):
44
 
        for path in iter_conflicts(Branch('.').working_tree()):
 
44
        for path in iter_conflicts(Branch.open_containing('.').working_tree()):
45
45
            print path
46
46
 
47
47
class cmd_resolve(bzrlib.commands.Command):