Extension:Paragraph-based Edit Conflict Interface

The TwoColConflict extension provides an alternative two-column view for the edit conflict resolution page. It highlights differences between the editor's and the conflicting change directly in the textfield for an easy possibility to copy and paste desired pieces of the text and resolving the conflict.

Usage
If enabled, whenever an edit conflict is happening while using the standard wikitext editor, the new conflict resolution view will show up. You will see your version of the text on the one side and the conflicting version on the other. Differences between those versions are highlighted and you can copy and paste desired text passages to adjust the version that should be saved.