From: Josh Triplett <josh@freedesktop.org>
Date: Thu, 7 Feb 2008 05:40:23 +0000 (-0800)
Subject: Update status of prefix-directives branch.
X-Git-Tag: 2.31~9^2~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/830152d2a970b3c301f42c4fb81b04e96e3b018f?ds=sidebyside

Update status of prefix-directives branch.
---

diff --git a/doc/git.mdwn b/doc/git.mdwn
index dc0376213..6cbc1e489 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -25,8 +25,10 @@ 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. It
-  is approximately one failing test case away from merging.
+
+* `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