OIC, merge fail long ago, grr!
Moved stuff up a level because it's got its own repository now.
Initial releasable.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.