X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=GeekiGeekiToDo;h=6b67e800db4e92b4021c03496dc825be6d4ffff5;hp=9e2bc89f72baea22020c3774acacb832d48ff223;hb=c7daa2cda6313f71e60f58d12ce4429fdda96f90;hpb=20af78b72e85083f780f5ab105842ed8c1b66cdd

diff --git a/GeekiGeekiToDo b/GeekiGeekiToDo
index 9e2bc89..6b67e80 100644
--- a/GeekiGeekiToDo
+++ b/GeekiGeekiToDo
@@ -2,6 +2,7 @@
 
  * Page delete
  * Page rename
+ * Page redirects (using symlinks)
  * Editing comment
  * Quick Find box in the menu
  * WikiCreole syntax: ##<****<macro param1 param2>****>##
@@ -17,5 +18,8 @@
  * Groups/ directory with group lists implemented as wiki pages with unordered lists
  * Includes (aka templates)
  * Syntax hilighting for code blocks
+=== Nice to have ===
+
+ * A functionality to have custom merge strategy in git to merge different wiki/GeekiGeeki in a single one
 
  * See also the original PikiToDo