jenkins-bot has submitted this change and it was merged.
Change subject: Normalize line breaks in edited text for diff
......................................................................
Normalize line breaks in edited text for diff
Change-Id: I57b9d73b76e7d977c6e469d48c34dc76193c6c03
---
M includes/TwoColConflictPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 90fec12..2869920 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -180,7 +180,7 @@
$yourText = $this->textbox1;
$currentLines = explode( "\n", $currentText );
- $yourLines = explode( "\n", $yourText );
+ $yourLines = explode( "\n", str_replace( "\r\n", "\n",
$yourText ) );
$combinedChanges = $this->getLineBasedUnifiedDiff(
$currentLines, $yourLines );
--
To view, visit https://gerrit.wikimedia.org/r/323512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57b9d73b76e7d977c6e469d48c34dc76193c6c03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
