← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-14 12:27:02 UTC
  • mto: (3874.4.6 refactor-delta-show)
  • mto: This revision was merged to the branch mainline in revision 3942.
  • Revision ID: v.ladeuil+lp@free.fr-20090114122702-iwqhiq00cxpcv43u
Fix typo.

* bzrlib/merge.py:
(Merge3Merger.merge_contents): Fix typo in doc string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1090
1090
                                parent_trans_id, trans_id)
1091
1091
 
1092
1092
    def merge_contents(self, file_id):
1093
 
        """Performa a merge on file_id contents."""
 
1093
        """Performs a merge on file_id contents."""
1094
1094
        def contents_pair(tree):
1095
1095
            if file_id not in tree:
1096
1096
                return (None, None)