HomePhabricator

[WIP] Display conflicting lines side by side
b90f0e5e78e0Unpublished

Unpublished Commit · Learn More

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

Description

[WIP] Display conflicting lines side by side

  • Left off creating the conflict view generator

Bug: T198210
Change-Id: Iaa6616a35a38a290e93923cd335732279747e8ec

Details

Provenance
Andrew-WMDEAuthored on Jul 19 2018, 4:37 PM
WMDE-FischCommitted on Jul 20 2018, 12:37 PM
Parents
rESCCabb1a25170eb: Localisation updates from https://translatewiki.net.
Branches
Unknown
Tags
Unknown
References
refs/changes/70/446870/2
ChangeId
Iaa6616a35a38a290e93923cd335732279747e8ec