Rev 3884: Fix typo. in file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

------------------------------------------------------------
revno: 3884
revision-id: v.ladeuil+lp at free.fr-20090114122702-iwqhiq00cxpcv43u
parent: v.ladeuil+lp at free.fr-20090114122553-nx32g4focos05pzp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanups
timestamp: Wed 2009-01-14 13:27:02 +0100
message:
  Fix typo.
  
  * bzrlib/merge.py:
  (Merge3Merger.merge_contents): Fix typo in doc string.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-12-11 03:18:52 +0000
+++ b/bzrlib/merge.py	2009-01-14 12:27:02 +0000
@@ -1090,7 +1090,7 @@
                                 parent_trans_id, trans_id)
 
     def merge_contents(self, file_id):
-        """Performa a merge on file_id contents."""
+        """Performs a merge on file_id contents."""
         def contents_pair(tree):
             if file_id not in tree:
                 return (None, None)