Even on Windows, some people have diff ;)

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 );