Rev 4598: Fix some typos. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4598
revision-id: v.ladeuil+lp at free.fr-20090813061932-ia102mjscytelufh
parent: pqm at pqm.ubuntu.com-20090811040617-g99p5v2wsn13ww8z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Thu 2009-08-13 08:19:32 +0200
message:
  Fix some typos.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/conflicts.py	2009-08-13 06:19:32 +0000
@@ -480,7 +480,7 @@
 
 
 class UnversionedParent(HandledConflict):
-    """An attempt to version an file whose parent directory is not versioned.
+    """An attempt to version a file whose parent directory is not versioned.
     Typically, the result of a merge where one tree unversioned the directory
     and the other added a versioned file to it.
     """

=== modified file 'bzrlib/help_topics/en/conflicts.txt'
--- a/bzrlib/help_topics/en/conflicts.txt	2007-12-25 04:17:50 +0000
+++ b/bzrlib/help_topics/en/conflicts.txt	2009-08-13 06:19:32 +0000
@@ -181,7 +181,7 @@
   Conflict: FILE.new is not a directory, but has files in it.
   Created directory.
 
-This happens when one side has added files to a directory, and the othe side
+This happens when one side has added files to a directory, and the other side
 has changed the directory into a file or symlink.  For example::
 
   $ bzr init