From 27a4c0aee2626137d06191e854d3d1f7c6467e15 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 3 Apr 2004 07:03:34 +0000
Subject: [PATCH] oops, debug output

---
 includes/GlobalFunctions.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index abb055825f..d17d6259f1 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -809,7 +809,6 @@ function wfMerge( $old, $mine, $yours, &$result ){
       wfEscapeShellArg( $mytextName ) . " " .
       wfEscapeShellArg( $oldtextName ) . " " .
       wfEscapeShellArg( $yourtextName );
-	  print "$cmd\n";
     $handle = popen( $cmd, "r" );
 
 	if( fgets( $handle ) ){
@@ -823,7 +822,6 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	#$cmd = "{$wgDiff3} -a -e --merge $mytextName $oldtextName $yourtextName";
 	$cmd = wfEscapeShellArg( $wgDiff3 ) . " -a -e --merge " . 
 	  wfEscapeShellArg( $mytextName, $oldtextName, $yourtextName );
-	print "$cmd\n";
 	$handle = popen( $cmd, "r" );
 	$result = "";
 	do {
-- 
2.20.1