#2 Merge/diff instead of locking

[Bryan English]

Instead of having to lock pages being edited, it would be nice to perform a diff/merge on pages so multiple people/processes could make changes to one page at the same time.