From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 May 2010 16:56:42 +0000 (-0400)
Subject: remerged
X-Git-Tag: 3.20100515~33^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5aa42d3e0f54649c8e5d3842ad0025279ba38a5;p=ikiwiki.git

remerged
---

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index f9f086793..9bd8938c5 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -18,3 +18,5 @@ see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/read
 > --[[Joey]] 
 
 >> Oh, I see why. Try the same branch again... --[[smcv]]
+
+>>> [[done]] --[[Joey]]