Rev 4659: Fix typo. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4659
revision-id: v.ladeuil+lp at free.fr-20101124162959-a77hwid1w0m89plh
parent: v.ladeuil+lp at free.fr-20101124162811-u4zbm42rnbcoq7sf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 638451-malformed
timestamp: Wed 2010-11-24 17:29:59 +0100
message:
  Fix typo.
-------------- next part --------------
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt	2010-11-24 16:01:57 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt	2010-11-24 16:29:59 +0000
@@ -119,7 +119,7 @@
   ``conflict``.  (Vincent Ladeuil, #323111)
 
 * ``bzr resolve --take-this`` and ``bzr resolve --take-other`` can now be
-  used for text conflicts. This will ignore the differences that was merged
+  used for text conflicts. This will ignore the differences that were merged
   cleanly and replace the file with its content in the current branch
   (``--take-this``) or with its content in the merged branch
   (``--take-other``). (Vincent Ladeuil, #638451)