Fixed problem with merging of identical changes

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 8133b75..ac00d4b 100644 (file)
--- 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 {