mercurial: fix date parsing so test suite passes

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

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 5149d79f94695f9f20b396185b2e66aa3621f8d5..b7b9164acd0c8bcbc3cc96e5e0e2134af1933b56 100644 (file)
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -22,4 +22,4 @@ Long-lived branches in the main git repository:
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki

-
+* `setup` contains the ikiwiki.setup file for this site