← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Frank Aspell
  • Date: 2009-02-22 16:54:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: frankaspell@googlemail.com-20090222165402-2myrucnu7er5w4ha
Fixing various typos

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
544
544
        :param working_tree: The working tree to apply the merge to
545
545
        :param this_tree: The local tree in the merge operation
546
546
        :param base_tree: The common tree in the merge operation
547
 
        :param other_tree: The other other tree to merge changes from
 
547
        :param other_tree: The other tree to merge changes from
548
548
        :param interesting_ids: The file_ids of files that should be
549
549
            participate in the merge.  May not be combined with
550
550
            interesting_files.