← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-06-12 02:11:45 UTC
  • mfrom: (1759.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: aaron.bentley@utoronto.ca-20060612021145-0ced20f7791f3c66
Fix some typos (found using aspell) (Jelmer Vernooij).

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: