[Cvs-cvs] ccvs ChangeLog NEWS

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/12 15:46:30

Modified files:
        .              : ChangeLog NEWS 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1367&r2=1.1368
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&r1=1.380&r2=1.381

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1367
retrieving revision 1.1368
diff -u -b -r1.1367 -r1.1368
--- ChangeLog   12 Sep 2008 14:42:03 -0000      1.1367
+++ ChangeLog   12 Sep 2008 15:46:26 -0000      1.1368
@@ -1,5 +1,7 @@
 2008-09-12  Derek Price  <address@hidden>
 
+       * NEWS: Note fix for bug #17565.
+
        * NEWS: Note several recent changes.
 
 2008-03-10  Mark D. Baushke  <address@hidden>

Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -b -r1.380 -r1.381
--- NEWS        12 Sep 2008 14:42:04 -0000      1.380
+++ NEWS        12 Sep 2008 15:46:30 -0000      1.381
@@ -47,6 +47,9 @@
 
 BUG FIXES
 
+* Changing keyword substitution mode no longer interferes with conflict
+  tracking (fixes bug #17565).
+
 * Merges of file removals using -j options are a little smarter.
 
 * `cvs add' checks more thoroughly for `CVS' directories in the argument list.