← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
26
26
    delta,
27
27
    osutils,
28
28
    revision as _mod_revision,
 
29
    conflicts as _mod_conflicts,
29
30
    symbol_versioning,
30
31
    )
31
32
from bzrlib.decorators import needs_read_lock
104
105
 
105
106
        Each conflict is an instance of bzrlib.conflicts.Conflict.
106
107
        """
107
 
        return []
 
108
        return _mod_conflicts.ConflictList()
108
109
 
109
110
    def extras(self):
110
111
        """For trees that can have unversioned files, return all such paths."""