Reedy has submitted this change and it was merged. Change subject: (Bug 41352) Proper fix for vanishing content. ......................................................................
(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 --- M includes/EditPage.php 1 file changed, 7 insertions(+), 31 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/29981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b1db6d76c0678d0ce795720e513e16e28e907d4 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Demon <ch...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
