only_committed_changes could fail in a git repository merged with git merge -s ours.

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

diff --git a/doc/todo/outbound_proxy.mdwn b/doc/todo/outbound_proxy.mdwn
index c54ee760c37df06ca8ecb4229457ab2beb0b75a0..2af0ae5ca6c51eda366a0357919ccf0df5e2f347 100644 (file)
--- a/doc/todo/outbound_proxy.mdwn
+++ b/doc/todo/outbound_proxy.mdwn
@@ -51,3 +51,7 @@ know whether its paranoia measures up or whether it supports proxies.
 
 > This looks fine, but you forgot to move the config entry for cookiejar
 > from aggregate to the config setting list in IkiWiki.pm --[[Joey]] 
+
+>> Indeed, fixed. --[[schmonz]]
+
+>>> [[merged|done]] --[[Joey]]