dépôts / lhc / web / wiklou.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9bb94b0) | patch
Get conflict results from diff3
authorWMDE-Fisch <christoph.jauera@wikimedia.de>
Thu, 29 Dec 2016 14:08:54 +0000 (15:08 +0100)
committeraddshore <addshorewiki@gmail.com>
Wed, 6 Dec 2017 12:25:35 +0000 (13:25 +0100)
commitb94a2829d40257cf97615353ada8ee46c2fd2e43
treec6038a56d5afe00ef333bb0c218894d476b32a3atree | snapshot
parent9bb94b0ac81dbdb00fc5110b93f66fd9f7ee3569commit | diff
Get conflict results from diff3

This patch extends the global wfMerge function to also return the
result of the first merge attempt that detects merge conflicts.

The additional output explicitly names the conflicting lines and
could help when solving edit conflicts.

Bug: T151320
Change-Id: I97acebdc87b31779200c7fde4dd4449cd1ee8ead
includes/GlobalFunctions.php diff | blob | history
tests/phpunit/includes/GlobalFunctions/GlobalTest.php diff | blob | history
Wiklou, le Wiki du Wiklou