Merge branch 'master' of git://git.ikiwiki.info

diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index 7df9e6b9f4e83c0c71c6324c1a5006cfcc546260..fdd2fbfd419db786dd336ce07905ab04304ffee6 100644 (file)
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -172,4 +172,7 @@ Bugs found and fixed so far:
 > Merged to current head. --[[Joey]] 
 
 * Return bounded output from `rcs_diff()` when asked, as the API states.
-   (6753235d98a3903364af26c0614106c47d93ae35
+   (6753235d98a3903364af26c0614106c47d93ae35)
+* When adding a text file under a name formerly tracked as binary,
+  fix CVS keyword substitution behavior by explicitly setting `-kkv`.
+   (e45175d5454cc72b261507260accb309f13b5e8b)