2011-10-14 | Paul Boddie | file changeset files shortlog | Changed the action to avoid saving the page if there is a conflict, opening the page editor in preview mode, showing the conflict regions in the unsaved page text. |
paul@12 | 1 | Done! |
paul@12 | 2 | (Perhaps record the parent version of the edited page so that merges can be done |
paul@12 | 3 | between queued and normal edits.) |