From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 29 Jul 2006 18:05:50 +0000 (+0000)
Subject: mercuriual backend in progress
X-Git-Tag: 1.12~19
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=13c466728c72379cc30551c75e882e2dcabbf38c

mercuriual backend in progress
---

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>