Gitiles
Code Review Sign In
gerrit.wikimedia.org / mediawiki / extensions / TwoColConflict

MediaWiki extension TwoColConflict

Clone this repo:

Branches

More...
  1. 9e6675d Use explicit nullable type on parameter arguments by Reedy · 3 days ago master wmf/branch_cut_pretest wmf/next
  2. 7f0c8eb tests: Give test user a name by Umherirrender · 35 hours ago
  3. c4fe34c Use namespaced classes by Umherirrender · 11 days ago REL1_43 wmf/1.43.0-wmf.28 wmf/1.44.0-wmf.1
  4. 2bc2fc4 Add notheme hack to make edit buttons visible in dark mode by thiemowmde · 3 weeks ago wmf/1.43.0-wmf.27
  5. 0e75813 Replace most problematic hard-coded colors with skin colors by thiemowmde · 3 weeks ago

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.