HomePhabricator
Diffusion extension-TwoColConflict 354a94738987

Display conflicting lines side by side
354a94738987Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Display conflicting lines side by side

Bug: T198210
Change-Id: Iaa6616a35a38a290e93923cd335732279747e8ec

Details

Provenance
Andrew-WMDEAuthored on Jul 19 2018, 4:37 PM
WMDE-FischCommitted on Jul 25 2018, 12:58 PM
Parents
rESCC4cbc5ecc77bc: Move InlineTwoColConflict modules to own dir
Branches
Unknown
Tags
Unknown
References
refs/changes/70/446870/9
ChangeId
Iaa6616a35a38a290e93923cd335732279747e8ec

Changes (13)

PathSize
i18n/
includes/
modules/
SplitTwoColConflict/
tests/
phpunit/
includes/
SplitTwoColConflict/

rESCC354a94738987

View Options

extension.json

Loading...
View Options

i18n/en.json

Loading...
View Options

i18n/qqq.json

Loading...
View Options

includes/SplitTwoColConflict/HtmlSplitConflictHeader.php

Loading...
View Options

includes/SplitTwoColConflict/HtmlSplitConflictView.php

Loading...
View Options

includes/SplitTwoColConflict/SplitTwoColConflictHelper.php

Loading...
View Options

includes/TwoColConflictHooks.php

Loading...
View Options

modules/SplitTwoColConflict/ext.TwoColConflict.Split.less

Loading...
View Options

tests/phpunit/includes/SplitTwoColConflict/HtmlSplitConflictHeaderTest.php

Loading...
View Options

tests/phpunit/includes/SplitTwoColConflict/HtmlSplitConflictViewTest.php

Loading...
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL