The Two Column Edit Conflict View is a new interface for the edit conflict resolution page. It displays colliding text passages in pairs next to each other, making it easier to merge your text with the one that’s currently online.

Extension: TwoColConflict

all extensions

Description: Showing a side-by-side edit merge screen for edit conflict resolution
State: stable Dependency: MediaWiki
Developer: Wikimedia Germany (WMDE) License: GPL v2+
Type: MediaWiki Category: Editor
Edition: BlueSpice free, BlueSpice pro, BlueSpice farm, BlueSpice cloud Version: 4.1+
For more info, visit Mediawiki.