Rev 4668: Fix NEWS. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4668
revision-id: v.ladeuil+lp at free.fr-20100203071836-u9b86q68fr9ri5s6
parent: v.ladeuil+lp at free.fr-20100203071621-1bzqu19rk3nyple2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: dont-add-conflict-helpers
timestamp: Wed 2010-02-03 08:18:36 +0100
message:
  Fix NEWS.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-02-03 07:16:21 +0000
+++ b/NEWS	2010-02-03 07:18:36 +0000
@@ -19,6 +19,11 @@
 New Features
 ************
 
+* Tree-shape conflicts can be resolved by providing ``--take-this`` and
+  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
+  as resolved is still accessible via the ``--done`` default action.
+  (Vincent Ladeuil)
+
 bzr 2.1.0 (not released yet)
 ############################
 
@@ -155,11 +160,6 @@
   ``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
   (Ted Gould, Matthew Fuller, Vincent Ladeuil)
 
-* Tree-shape conflicts can be resolved by providing ``--take-this`` and
-  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
-  as resolved is still accessible via the ``--done`` default action.
-  (Vincent Ladeuil)
-
 Bug Fixes
 *********