1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/to-do/record-parent-for-proper-merges.txt Mon Oct 10 22:15:09 2011 +0200
1.3 @@ -0,0 +1,2 @@
1.4 +Perhaps record the parent version of the edited page so that merges can be done
1.5 +between queued and normal edits.