dépôts / lhc / web / wiklou.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1daf0c5) | patch
(Bug 41352) Proper fix for vanishing content.
authordaniel <daniel.kinzler@wikimedia.de>
Thu, 25 Oct 2012 16:59:56 +0000 (18:59 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Thu, 8 Nov 2012 18:09:33 +0000 (19:09 +0100)
commite74f70d6345c8228cc6ae598779c351c4eafd348
treefcd3925678dde8ecd42c7236cbc1bc0d5623cbb5tree | snapshot
parent1daf0c56d9065280e9ef41f45dcf0820de4ef62ccommit | diff
(Bug 41352) Proper fix for vanishing content.

This reverts the temporary fix in I4c2055be and instead fixes the
resolution of merge conflicts using Contenthandler::merge3.

Change-Id: I0b1db6d76c0678d0ce795720e513e16e28e907d4
includes/EditPage.php diff | blob | history
Wiklou, le Wiki du Wiklou