Rev 4676: Add NEWS entry. in file:///home/vila/src/bzr/bugs/merge-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/merge-strict/

------------------------------------------------------------
revno: 4676
revision-id: v.ladeuil+lp at free.fr-20090908164640-v4lp3ssa2u2niudt
parent: v.ladeuil+lp at free.fr-20090908164511-5e7eupewxycwaue4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: merge-strict
timestamp: Tue 2009-09-08 18:46:40 +0200
message:
  Add NEWS entry.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-09-04 00:49:55 +0000
+++ b/NEWS	2009-09-08 16:46:40 +0000
@@ -30,6 +30,10 @@
   longer report incorrect errors about ``Missing inventory ('TREE_ROOT', ...)``
   (Robert Collins, #416732)
 
+* ``bzr merge`` and ``bzr remove-tree`` now requires --force if pending
+  merges are present in the working tree.
+  (Vincent Ladeuil, #426344)
+
 * Don't restrict the command name used to run the test suite.
   (Vincent Ladeuil, #419950)