#
#
# patch "NEWS"
#  from [2fcda352f351bb02ab60a4fa67dd727215174f44]
#    to [7d6fb5fb42dc6351f7bd7a5dbac82273994498de]
#
============================================================
--- NEWS	2fcda352f351bb02ab60a4fa67dd727215174f44
+++ NEWS	7d6fb5fb42dc6351f7bd7a5dbac82273994498de
@@ -23,6 +23,11 @@
 
         - `commit' now uses keydir specified in _MTN/options
 
+        - duplicate name conflicts now show a proper error message, even if
+          a parent directory got renamed as well. In that case, the error
+          message now shows both names for the directory and the offending
+          file name.
+
         New features
 
         - The bare parent selector 'p:' can now be used in a workspace to