Don't re-run diff3 with missing files for the debug comment; it'll be wrong.

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1b07a15..f26c95a 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -916,7 +916,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
        unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
 
        if ( $result === '' && $old !== '' && $conflict == false ) {
-               wfDebug( "Unexpected null result from diff3.\nCommand: $cmd\nOutput: " . `$cmd 2>&1` . "\n" );
+               wfDebug( "Unexpected null result from diff3. Command: $cmd\n" );
                $conflict = true;
        }
        return ! $conflict;