From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 10 Feb 2008 07:11:05 +0000 (-0500)
Subject: prefix-directives branch is merged so no need to list anymore
X-Git-Tag: 2.40~142
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a13c7508c4bda8340497e8ab9d03e56fb5ddc30;p=ikiwiki.git

prefix-directives branch is merged so no need to list anymore
---

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 6cbc1e489..8005dcf6e 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -25,10 +25,6 @@ Some of the branches included in the main repository include:
   work with the current *master* branch again.
 * `html` is an unfinished attempt at making ikiwiki output HTML 4.01
   instead of xhtml.
-
-* `prefix-directives` changes the preprocessor directive syntax.
-  Passes all test cases; pending merge.
-
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `pristine-tar` contains deltas that