HomePhabricator

Display conflicting lines side by side
8951e82d1d61Unpublished

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:49 PM
Parents
rESCC4cbc5ecc77bc: Move InlineTwoColConflict modules to own dir
Branches
Unknown
Tags
Unknown
References
refs/changes/70/446870/8
ChangeId
Iaa6616a35a38a290e93923cd335732279747e8ec