dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e44fec8
)
oops, debug output
author
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 3 Apr 2004 07:03:34 +0000
(07:03 +0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Sat, 3 Apr 2004 07:03:34 +0000
(07:03 +0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
abb0558
..
d17d625
100644
(file)
--- 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 {