web commit by http://ethan.betacantrips.com/: addendum

diff --git a/doc/patchqueue/disappearing_pages.mdwn b/doc/patchqueue/disappearing_pages.mdwn
index 434859d4385784207ae1f1bfc22568c9a2a3f85c..d699d5b6c19a11e810bbd3860e95c6223a5c1d86 100644 (file)
--- 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).
 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
 
     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