Merge commit 'upstream/master' into pub/po

[git.ikiwiki.info.git] / doc / git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 8a89546cf7d3fff0d791ead8acc39e58f1530e7b..87b1aaae6d9b40b6b89c22820b380e4f8d055163 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -50,7 +50,6 @@ Some of the branches included in the main repository include:
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
-* `darcs` is being used to add darcs support.
 * `debian-stable` is used for updates to the old version included in
   Debian's stable release, and `debian-testing` is used for updates to
   Debian's testing release.