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:
92b145d
)
Don't re-run diff3 with missing files for the debug comment; it'll be wrong.
author
Brion Vibber
<brion@users.mediawiki.org>
Thu, 27 Oct 2005 23:09:06 +0000
(23:09 +0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Thu, 27 Oct 2005 23:09:06 +0000
(23:09 +0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
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;