X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e2d18188c780740970f2b25ef09057669ce765b3..ba1353fed2e076bdab5145e84a3776de6981979e:/doc/todo/pedigree_plugin.mdwn

diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index bb8406344..05c3597a1 100644
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -156,9 +156,9 @@ Any opinions on the idea/design/implementation?
 >>>>> with only `PEDIGREE`, `DEPTH`, `HEIGHT`, `DEPTH_n` and
 >>>>> `HEIGHT_n`. -- intrigeri
 
->>>>>> Done, and pushed in my pedigree branch. I'm going to start
->>>>>> preparing the rename + move of parentlinks from the core.
->>>>>> --[[intrigeri]]
+>>>>>> Done, and pushed in my pedigree branch. Update: I've also done and
+>>>>>> pushed two commits that rename the plugin and replace 
+>>>>>> the core parentlinks with this one. --[[intrigeri]]
 
 (I'll try never to rebase this branch, but writing this plugin has
 been a pretext for me to start learning Git, so...)
@@ -180,3 +180,6 @@ default templates do use parentlinks ;).
 >> Just commited a testsuite for this plugin, BTW. It's nearly twice 
 >> big as the plugin itself, I'm wondering... -- intrigeri
 
+Merged, nice work. (Overkill having a test suite. ;-) --[[Joey]] 
+
+[[tag patch done]]