Action to merge text of two revisions - or two pages - into one editor text area, highlight conflicting text, & save result as new revision
My users often overwrite portions of pages with their own text
While not necessarily a problem, other users sometimes see valuable information in both the overwritten & overwritting text - & wish to merge them
This can be done manually, or using an external editor with diffing features - good suggestion, <starshine> - thanks!
However Moin already provides a very convenient interface for merging two page revisions in case of an edit conflict - the text of both edits is merged into one editor text area & conflicting text is highlighted
<nir> & <starshine> suggest using two browsers & saving the two revisions so as to instigate an edit conflict
This works, but a "merge" action would be a convenient shortcut
Many thanks for the awesome work on Moin - it's totally rad!