| Index: trunk/phase3/tests/parser/parserTest.inc |
| — | — | @@ -1068,7 +1068,9 @@ |
| 1069 | 1069 | $shellInfile = wfEscapeShellArg($infile); |
| 1070 | 1070 | $shellOutfile = wfEscapeShellArg($outfile); |
| 1071 | 1071 | |
| 1072 | | - $diff = wfIsWindows() |
| | 1072 | + global $wgDiff3; |
| | 1073 | + // we assume that people with diff3 also have usual diff |
| | 1074 | + $diff = ( wfIsWindows() && !$wgDiff3 ) |
| 1073 | 1075 | ? `fc $shellInfile $shellOutfile` |
| 1074 | 1076 | : `diff -au $shellInfile $shellOutfile`; |
| 1075 | 1077 | unlink( $infile ); |