Rev 4663: The bugs aren't fixed until the options are taken into account for text in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4663
revision-id: v.ladeuil+lp at free.fr-20100106112859-bsqzmnwzntlc8nq3
parent: v.ladeuil+lp at free.fr-20100106111845-inun0xxl8rx4yvst
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Wed 2010-01-06 12:28:59 +0100
message:
  The bugs aren't fixed until the options are taken into account for text
  conflicts too (which requires at least discussion and the ability to
  resolve only the conflicted regions as opposed to taking .THIS or .OTHER
  as whole).
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-01-05 17:06:38 +0000
+++ b/NEWS	2010-01-06 11:28:59 +0000
@@ -31,7 +31,7 @@
 * Tree-shape conflicts can be resolved by providing ``--keep-mine`` and
   ``--take-theirs`` to the ``bzr resolve`` command. Just marking the conflict
   as resolved is still accessible via the ``--done`` default action.
-  (Vincent Ladeuil, #257297, #232512)
+  (Vincent Ladeuil)
 
 Bug Fixes
 *********