diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-12 23:53:09 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-12 23:53:09 +0000 |
| commit | e0d6d268bc20b772d30381444e6e37d774058ab1 (patch) | |
| tree | 8d18475d57e8f86d2ce3354c2a0716b3843dff96 /doc/patchqueue | |
| parent | b7939ba67cd4ea72120bd956980306a915d3ac67 (diff) | |
| download | ikiwiki-e0d6d268bc20b772d30381444e6e37d774058ab1.tar ikiwiki-e0d6d268bc20b772d30381444e6e37d774058ab1.tar.gz | |
web commit by http://ethan.betacantrips.com/: addendum
Diffstat (limited to 'doc/patchqueue')
| -rw-r--r-- | doc/patchqueue/disappearing_pages.mdwn | 4 |
1 files changed, 3 insertions, 1 deletions
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 |