Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test
This commit is contained in:
Anatol Belski 2014-12-01 18:55:52 +01:00
commit fe4a5abf30

View File

@ -54,6 +54,6 @@ rmdir($td);
?>
--EXPECTF--
Bug66405 file3.csv
string %s/bug66405/file1.txt
string %s/bug66405/file2.md
string %s/bug66405/testsubdir/file3.csv
string %s%ebug66405%efile1.txt
string %s%ebug66405%efile2.md
string %s%ebug66405%etestsubdir%efile3.csv