← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
24
24
import errno
25
25
 
26
26
from bzrlib import (
 
27
    builtins,
27
28
    cleanup,
28
29
    commands,
29
30
    errors,
126
127
            if action is None:
127
128
                action = 'done'
128
129
        else:
129
 
            tree, file_list = workingtree.WorkingTree.open_containing_paths(
130
 
                file_list)
 
130
            tree, file_list = builtins.tree_files(file_list)
131
131
            if file_list is None:
132
132
                if action is None:
133
133
                    # FIXME: There is a special case here related to the option