[Cvs-cvs] Changes to ccvs/NEWS

[Derek Robert Price]

Index: ccvs/NEWS
diff -u ccvs/NEWS:1.333 ccvs/NEWS:1.334
--- ccvs/NEWS:1.333     Tue Sep  6 15:41:42 2005
+++ ccvs/NEWS   Fri Sep 23 03:19:22 2005
@@ -42,6 +42,14 @@
 
 BUG FIXES
 
+* CVS server now handles conflict markers in Entry requests as documented.
+
+* CVS now remembers that binary file merge conflicts occurred until the
+  timestamp of the updated binary file changes.
+
+* CVS client now saves some bandwidth by not sending the contents of files
+  with conflicts to the server when it isn't needed.
+
 * CVS now does correct locking during import.
 
 * A problem where the server could block indefinitely waiting for an EOF from