diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-01-30 19:56:51 -0600 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-01-30 19:56:51 -0600 |
| commit | 8e752d09766da8b3ebb9ca9ba6f67be7168e63d1 (patch) | |
| tree | 1858451087b52a8c3fad036e053cfd704d8feb8f /doc/rcs | |
| parent | 51d0aa406d40aa8dede624736f64f2ed055360b9 (diff) | |
| parent | 111db0b6be5b8fc5881e1e383d5360b768f68845 (diff) | |
| download | ikiwiki-8e752d09766da8b3ebb9ca9ba6f67be7168e63d1.tar ikiwiki-8e752d09766da8b3ebb9ca9ba6f67be7168e63d1.tar.gz | |
Merge branch 'master' into cvs
Diffstat (limited to 'doc/rcs')
| -rw-r--r-- | doc/rcs/cvs/discussion.mdwn | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 2df2c1317..e10892e7d 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -159,3 +159,14 @@ branch harder for you to pull. Before I go writing a whole swack of test cases, could you merge my latest? Through at least ad0e56cdcaaf76bc68d1b5c56e6845307b51c44a there should be no functional change. --[[schmonz]] + +Never mind, I was able to convince myself (by cloning `origin` +afresh and merging from `schmonz/cvs`). The history is a little +gross but the before-and-after diff looks right. + +Bugs found and fixed so far: + +* Stop treating text files as binary (`-kb`) on `rcs_add()` + (ac8eab29e8394aca4c0b23a6687ec947ea1ac869) + +> Merged to current head. --[[Joey]] |