From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 5 Feb 2012 21:38:52 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20120203~181
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4a47241a3e7dd1c8df1cd0593b116f41c4f18a51?hp=c8f7b96909286407cfe4e52add0d98044cc21c4e

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

diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index 7df9e6b9f..fdd2fbfd4 100644
--- 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)