← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-10 00:21:11 UTC
  • mto: (1558.16.3 revert-missing)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: jelmer@samba.org-20060610002111-ff582d7ee2090037
Fix some types (found using aspell).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
792
792
                                          pb=pb, pp=pp, reprocess=reprocess)
793
793
 
794
794
    def _get_revision_tree(self, tree):
795
 
        """Return a revision tree releated to this tree.
 
795
        """Return a revision tree related to this tree.
796
796
        If the tree is a WorkingTree, the basis will be returned.
797
797
        """
798
798
        if getattr(tree, 'get_weave', False) is False: