aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-02-05 01:28:01 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-02-05 01:28:01 -0500
commitd7ff0326b4321289be846589f31db5670dc33841 (patch)
treea88f5559205c6f3c5dfe6be12de1da62ff3f67a9
parent0a05ac9205612e39eb613c3daf94567bc50017e2 (diff)
parent65b021268bd600561e30110b6dc1a453f3d52557 (diff)
downloadikiwiki-d7ff0326b4321289be846589f31db5670dc33841.tar
ikiwiki-d7ff0326b4321289be846589f31db5670dc33841.tar.gz
Merge branch 'master' into cvs
-rw-r--r--doc/bugs/find_gnuism.mdwn5
-rw-r--r--doc/rcs/cvs/discussion.mdwn3
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/find_gnuism.mdwn b/doc/bugs/find_gnuism.mdwn
new file mode 100644
index 000000000..89eee7816
--- /dev/null
+++ b/doc/bugs/find_gnuism.mdwn
@@ -0,0 +1,5 @@
+[[!template id=gitbranch branch=schmonz/portability author="[[schmonz]]"]]
+
+Whoops, somehow missed a spot on the last incarnation of this branch.
+`find -not` doesn't work on NetBSD and `find !` runs equivalently
+for me. Fixed in 9659272e25fac37f896991dab01a05b4f4c85ccb.
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index e10892e7d..7df9e6b9f 100644
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -170,3 +170,6 @@ 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