Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/forum/Darcs_as_the_RCS___63__.mdwn b/doc/forum/Darcs_as_the_RCS___63__.mdwn
index ea53006eaf8265f1deeefd1ddb7da0e406575195..2635690f7042e56e124f92befddf705daeb85204 100644 (file)
--- a/doc/forum/Darcs_as_the_RCS___63__.mdwn
+++ b/doc/forum/Darcs_as_the_RCS___63__.mdwn
@@ -7,3 +7,5 @@ Currently, I have set up the RCS to be git but I do not like this very much. I'd
 What should I put in the configuration file to use darcs ?
 
 > Darcs is not yet supported. It's being [[worked_on|todo/darcs]].
+
+> > That's good news for me then ! Thank you.

diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index b8ddfd485fdcbe6a7e05976e3a8a80e7563f6cd6..e5bf5ee271fe32d98ba2ab50140d9f99f187a979 100644 (file)
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -546,4 +546,6 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
 >> `rcs_commit_staged`. For some revision control systems, which
 >> automatically commit modifications, it would be a no-op. --[[Joey]]
 
+>>> Done. --pesco
+
 [[!tag patch]]