From: Mr. E23 <e23@users.mediawiki.org>
Date: Sun, 14 Mar 2004 21:34:03 +0000 (+0000)
Subject: Fixed problem with merging of identical changes
X-Git-Tag: 1.3.0beta1~791
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=eacbec82207311cbfe8d90ddb2e37f47377899f4;p=lhc%2Fweb%2Fwiklou.git

Fixed problem with merging of identical changes
---

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 {