Rev 3910: Add NEWS entry. in lp:~vila/bzr/306879-show-base-revid

[Vincent Ladeuil]

At lp:~vila/bzr/306879-show-base-revid

------------------------------------------------------------
revno: 3910
revision-id: v.ladeuil+lp at free.fr-20081216172926-mc8dt2qyfg1pxa2y
parent: v.ladeuil+lp at free.fr-20081216162615-flta6emkfkpet1tt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 306879-show-base-revid
timestamp: Tue 2008-12-16 18:29:26 +0100
message:
  Add NEWS entry.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-12-15 04:37:10 +0000
+++ b/NEWS	2008-12-16 17:29:26 +0000
@@ -32,7 +32,11 @@
       alternative branch. (Michael Hudson)
 
   BUG FIXES:
-  
+
+    * Add the revision id after the 'BASE-REVISION' conflict marker inserted
+      when --show-base is used for merge.
+      (Vincent Ladeuil, #306879)
+
     * Allow BzrDir implementation to implement backing up of 
       control directory. (#139691)