MediaWiki extension TwoColConflict

Clone this repo:
  1. a9a3a4b Localisation updates from https://translatewiki.net. by Translation updater bot · 10 hours ago master
  2. 0c87a1e Use Codex markup for warning message by Jon Robson · 3 weeks ago wmf/1.43.0-wmf.25 wmf/branch_cut_pretest
  3. 9f023ac Merge "special page to use StatsFactory" by jenkins-bot · 7 days ago
  4. 1a98721 Localisation updates from https://translatewiki.net. by Translation updater bot · 8 days ago
  5. 9a2cd01 Localisation updates from https://translatewiki.net. by Translation updater bot · 2 weeks ago wmf/1.43.0-wmf.24

This extension provides a side-by-side edit merge screen for edit conflict resolution

See https://www.mediawiki.org/wiki/Extension:TwoColConflict for technical documentation and more links.