Rev 5136: Fix typo. in file:///home/vila/src/bzr/bugs/805809-no-final-path/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/805809-no-final-path/

------------------------------------------------------------
revno: 5136
revision-id: v.ladeuil+lp at free.fr-20110705093225-p1w0eri2tuqwvp1w
parent: v.ladeuil+lp at free.fr-20110705091252-7qpkbzgr4wyrvwvq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 805809-no-final-path
timestamp: Tue 2011-07-05 11:32:25 +0200
message:
  Fix typo.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2011-07-05 09:12:52 +0000
+++ b/bzrlib/merge.py	2011-07-05 09:32:25 +0000
@@ -1625,7 +1625,7 @@
                     other_path = '<deleted>'
                 else:
                     if other_parent == self.other_tree.get_root_id():
-                        # The tree transform don't know about the other root,
+                        # The tree transform doesn't know about the other root,
                         # so we special case here to avoid a NoFinalPath
                         # exception
                         parent_path = ''