From e0d6d268bc20b772d30381444e6e37d774058ab1 Mon Sep 17 00:00:00 2001 From: joey Date: Mon, 12 Feb 2007 23:53:09 +0000 Subject: web commit by http://ethan.betacantrips.com/: addendum --- doc/patchqueue/disappearing_pages.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/patchqueue/disappearing_pages.mdwn b/doc/patchqueue/disappearing_pages.mdwn index 434859d43..d699d5b6c 100644 --- a/doc/patchqueue/disappearing_pages.mdwn +++ b/doc/patchqueue/disappearing_pages.mdwn @@ -4,7 +4,9 @@ failing gracefully, and allowing the user to commit a new file with the same name if desired. The patch is [here](http://ikidev.betacantrips.com//patches/disappear.patch). -It requires a strip level of 4 -- sorry about that. --Ethan +It requires a strip level of 4 -- sorry about that. There are also some +other changes in the conflict-resolution section which seemed to make sense, +let me know what you think. --Ethan diff -urX /home/glasserc/ignorepats /home/glasserc/ikiclean/IkiWiki/CGI.pm /home/glasserc/ikidev/IkiWiki/CGI.pm --- /home/glasserc/ikiclean/IkiWiki/CGI.pm 2007-02-11 21:40:32.419641000 -0800 -- cgit v1.2.3