From eacbec82207311cbfe8d90ddb2e37f47377899f4 Mon Sep 17 00:00:00 2001
From: "Mr. E23" <e23@users.mediawiki.org>
Date: Sun, 14 Mar 2004 21:34:03 +0000
Subject: [PATCH] Fixed problem with merging of identical changes

---
 includes/GlobalFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 8133b755fa..ac00d4b37c 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -879,7 +879,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 		$conflict = false;
 	}
 	pclose( $handle );
-	$cmd = "{$wgDiff3} -a --merge $mytextName $oldtextName $yourtextName";
+	$cmd = "{$wgDiff3} -a -e --merge $mytextName $oldtextName $yourtextName";
 	$handle = popen( $cmd, "r" );
 	$result = "";
 	do {
-- 
2.20.1