X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/30afedcfe2799bb6cc4bf329bd273ad9d8dd6da3..627c20808a311cb0250bf8e15fd0e9b0cbfc0ba5:/doc/about_rcs_backends.mdwn 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. + +