← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Removed all remaining uses of root_directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
525
525
            if file_id not in tree:
526
526
                return (None, None)
527
527
            kind = tree.kind(file_id)
528
 
            if kind == "root_directory":
529
 
                kind = "directory"
530
528
            if kind == "file":
531
529
                contents = tree.get_file_sha1(file_id)
532
530
            elif kind == "symlink":