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
 Enabling the new view:  To enable the new view for edit-conflict resolution, you have to be logged in and tick the checkbox for the Two column edit conflict feature on the beta-features preferences page in your Wiki.

Configuration

 * : (boolean, true by default) Activate this extension as a Beta Feature when Extension:BetaFeatures is activated.
 * : (boolean, true by default) Use the view with inline conflicting changes in one column and a classic wikitext form in the other column; the alternative view is a diff similar to MediaWiki built-in view, but with buttons on each conflicting line to select one or the other version.

Links
* Help page and central feedback page on mw.org * Main project page on Meta