← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
819
819
                                          pb=pb, pp=pp, reprocess=reprocess)
820
820
 
821
821
    def _get_revision_tree(self, tree):
822
 
        """Return a revision tree releated to this tree.
 
822
        """Return a revision tree related to this tree.
823
823
        If the tree is a WorkingTree, the basis will be returned.
824
824
        """
825
825
        if getattr(tree, 'get_weave', False) is False: