summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/pedigree_plugin.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index 7b0aa81a4..bb8406344 100644
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -156,6 +156,10 @@ 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]]
+
(I'll try never to rebase this branch, but writing this plugin has
been a pretext for me to start learning Git, so...)