Rev 5623: Add news entry in file:///home/vila/src/bzr/bugs/715058-resolve-text-subdir/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/715058-resolve-text-subdir/

------------------------------------------------------------
revno: 5623
revision-id: v.ladeuil+lp at free.fr-20110208105310-cdsiwahvwph8iaj6
parent: v.ladeuil+lp at free.fr-20110208105237-0g0r5q65rslvzrfx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 715058-resolve-text-subdir
timestamp: Tue 2011-02-08 11:53:10 +0100
message:
  Add news entry
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-02-04 22:25:59 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-02-08 10:53:10 +0000
@@ -32,6 +32,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* Correctly resolve text conflicts for files in subdirs.
+  (Vincent Ladeuil, #715058)
+
 * Restore proper logging of bytes transferred. We accidentally reset the
   counter when commands finished before we logged the total transferred.
   (John Arbash Meinel, #713258)