Hashar has uploaded a new change for review. Change subject: avoid STDERR diff3 messages when using wfMerge() ......................................................................
avoid STDERR diff3 messages when using wfMerge() diff3 issues a warning to stderr if any of the files does not end with a newline character. TextContent::preSaveTransform() does normalize revision text by simply calling trim(). Thus to avoid a diff3 error we simply apply the same normalization and add a newline to please the command. Change-Id: I7baa3df95dd70cbc865b2491ccc791e60f8b9e6e --- M includes/GlobalFunctions.php 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/38/32738/1 -- To view, visit https://gerrit.wikimedia.org/r/32738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7baa3df95dd70cbc865b2491ccc791e60f8b9e6e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
