Merge branch 'master' into cvs

[ikiwiki.git] / doc / rcs / cvs / discussion.mdwn

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