summaryrefslogtreecommitdiff
path: root/doc/plugins/contrib/cvs/discussion.mdwn
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-08-30 16:34:32 -0400
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-08-30 16:34:32 -0400
commitfe350e8b895be69471fad094fcdcf0b4c7d3beb3 (patch)
tree5d48b57f583fedc2a9b765d3a9ea7b0c6c1d5891 /doc/plugins/contrib/cvs/discussion.mdwn
parent1af7d7d8429b6e73493a5f8ba877c6cfb888cfe1 (diff)
parent7021fc36466d80ca0c4105b82239d3ba008ade80 (diff)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
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