delta/php-git.git/sapi/cli/tests/CONFLICTS, branch php-7.4.14 git.php.net: repository/php-src.git Implement fine-grained conflict handling 2019-02-20T10:20:40+00:00 Nikita Popov nikita.ppv@gmail.com 2019-02-18T15:43:22+00:00 c0e15a3b7fef5b341eb96e0e888f180ba7a39570 Tests can specify conflict keys, either in --CONFLICTS-- or a per-directory CONFLICTS file. Non-conflicting tests may be run in parallel. 
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.