summaryrefslogtreecommitdiff
path: root/doc/plugins/contrib/cvs/discussion.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-30 14:38:19 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-30 14:38:19 -0400
commit6646841fa2c659153c44f73c0da846ef9829b8be (patch)
treef84f92f6eb9d0b88cd2102b9c0d06b75e17981de /doc/plugins/contrib/cvs/discussion.mdwn
parent29db15d31cff5e8b59020ad908ea4985e62ff22e (diff)
parent58cef9c3cf6da1b614c0a24ebef15a0d8ecea335 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/plugins/contrib/cvs/discussion.mdwn')
-rw-r--r--doc/plugins/contrib/cvs/discussion.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index e1fa6e428..e142452d0 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -52,6 +52,10 @@ the "cvs add <directory>" call and avoid doing anything in that case?
>>>>>> I don't see how there could possibly be a difference between
>>>>>> ikiwiki's C wrapper and your shell wrapper wrapper here. --[[Joey]]
+>>>>>>> I was comparing strings overly precisely. Fixed on my branch.
+>>>>>>> I've also knocked off the two most pressing to-do items. I
+>>>>>>> think the plugin's ready for prime time. --[[schmonz]]
+
> Thing 2 I'm less sure of. (I'd like to see the web UI return
> immediately on save anyway, to a temporary "rebuilding, please wait
> if you feel like knowing when it's done" page, but this problem