#
#
# patch "NEWS"
#  from [1b6f7fdb18d6e0e7b711a54eeb6a8afd411e075a]
#    to [76511d0b3a4b098028881ed70e290f90f0928584]
#
============================================================
--- NEWS	1b6f7fdb18d6e0e7b711a54eeb6a8afd411e075a
+++ NEWS	76511d0b3a4b098028881ed70e290f90f0928584
@@ -131,12 +131,12 @@ Xxx Xxx 99 99:99:99 UTC 2010
         - The 'passphrase' and 'dropkey' commands now handle private keys
           in old-style key files (without the hash part in the file name)
           properly.
-          monotone also makes it very sure now that the key file of a 
+          monotone also makes it very sure now that the key file of a
           private key which is about to be deleted really and only
-          contains the key which should be deleted and nothing else 
+          contains the key which should be deleted and nothing else
           (fixes monotone bug #30376)
 
-        - monotone no longer throws an unrecoverable error if a public or 
+        - monotone no longer throws an unrecoverable error if a public or
           private key is addressed with some non-existing key id
           (fixes monotone bug #30462)
 
@@ -148,6 +148,9 @@ Xxx Xxx 99 99:99:99 UTC 2010
           but instead validates if the given revision really exists in the
           current database.
 
+        - `mtn conflicts store` now gives a nice error message when
+          run outside a workspace (fixes bug #30473)
+
         Other
 
 Sun Jun 13 22:13:53 UTC 2010