From 3bf3fb7c9bf19601e17e0853aa446e0b4b54186e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 27 Oct 2005 23:09:06 +0000
Subject: [PATCH] Don't re-run diff3 with missing files for the debug comment;
 it'll be wrong.

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1b07a1537a..f26c95a18b 100644
--- 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;
-- 
2.20.1