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:
df19f6c
)
Even on Windows, some people have diff ;)
author
Max Semenik
<maxsem@users.mediawiki.org>
Tue, 6 Sep 2011 15:20:07 +0000
(15:20 +0000)
committer
Max Semenik
<maxsem@users.mediawiki.org>
Tue, 6 Sep 2011 15:20:07 +0000
(15:20 +0000)
tests/parser/parserTest.inc
patch
|
blob
|
history
diff --git
a/tests/parser/parserTest.inc
b/tests/parser/parserTest.inc
index
4782bda
..
b52afb4
100644
(file)
--- a/
tests/parser/parserTest.inc
+++ b/
tests/parser/parserTest.inc
@@
-1068,7
+1068,9
@@
class ParserTest {
$shellInfile = wfEscapeShellArg($infile);
$shellOutfile = wfEscapeShellArg($outfile);
- $diff = wfIsWindows()
+ global $wgDiff3;
+ // we assume that people with diff3 also have usual diff
+ $diff = ( wfIsWindows() && !$wgDiff3 )
? `fc $shellInfile $shellOutfile`
: `diff -au $shellInfile $shellOutfile`;
unlink( $infile );