Merge in changes from branch created for new server. The old server is now history... so we can make the new server use HEAD.
Now do the whole CMS module.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.