GitHub - wikimedia/mediawiki-extensions-TwoColConflict: Github mirror of MediaWiki extension TwoColConflict - our actual code is hosted with Gerrit (please see https://www.mediawiki.org/wiki/Developer_access for contributing)

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

Name		Name	Last commit message	Last commit date
Latest commit History 2,180 Commits
.phan		.phan
docs		docs
i18n		i18n
includes		includes
modules		modules
resources		resources
tests		tests
.eslintrc.json		.eslintrc.json
.gitignore		.gitignore
.gitreview		.gitreview
.phpcs.xml		.phpcs.xml
.stylelintrc.json		.stylelintrc.json
.svgo.config.js		.svgo.config.js
CODE_OF_CONDUCT.md		CODE_OF_CONDUCT.md
COPYING		COPYING
Gruntfile.js		Gruntfile.js
README.md		README.md
TwoColConflict.alias.php		TwoColConflict.alias.php
composer.json		composer.json
extension.json		extension.json
package-lock.json		package-lock.json
package.json		package.json

wikimedia/mediawiki-extensions-TwoColConflict