aboutsummaryrefslogtreecommitdiff
path: root/doc/about_rcs_backends.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-29 18:05:50 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-29 18:05:50 +0000
commit13c466728c72379cc30551c75e882e2dcabbf38c (patch)
tree5afc076107a27786f27acbefadf89e7a53b9e21b /doc/about_rcs_backends.mdwn
parent7127b70063bb0b17e9f46abc48519f5a4cc9d289 (diff)
downloadikiwiki-13c466728c72379cc30551c75e882e2dcabbf38c.tar
ikiwiki-13c466728c72379cc30551c75e882e2dcabbf38c.tar.gz
mercuriual backend in progress
Diffstat (limited to 'doc/about_rcs_backends.mdwn')
-rw-r--r--doc/about_rcs_backends.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/about_rcs_backends.mdwn b/doc/about_rcs_backends.mdwn
index 1aafd4a8e..85468bc7c 100644
--- a/doc/about_rcs_backends.mdwn
+++ b/doc/about_rcs_backends.mdwn
@@ -90,3 +90,9 @@ bugs. It also has some drawbacks (especially wrt merge which was the hard
part). GIT doesn't have a similar functionality like 'svn merge -rOLD:NEW
FILE' (please see the relevant comment in mergepast for more details), so I
had to invent an ugly hack just for the purpose.
+
+## [mercurial](http://www.selenic.com/mercurial/)
+
+Being worked on by Emanuele Aina.
+
+<http://techn.ocracy.org/ikiwiki>