diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-18 16:43:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-20 11:20:40 +0100 |
| commit | c0e15a3b7fef5b341eb96e0e888f180ba7a39570 (patch) | |
| tree | 3f16d8690ce435b103b842604a62f297c9f04fe9 /ext/ftp | |
| parent | 0513d59ed33c3439b2fb52bc39feff18a2b5436a (diff) | |
| download | php-git-c0e15a3b7fef5b341eb96e0e888f180ba7a39570.tar.gz | |
Implement fine-grained conflict handling
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.
Diffstat (limited to 'ext/ftp')
| -rw-r--r-- | ext/ftp/tests/CONFLICTS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/ftp/tests/CONFLICTS b/ext/ftp/tests/CONFLICTS new file mode 100644 index 0000000000..254defddb5 --- /dev/null +++ b/ext/ftp/tests/CONFLICTS @@ -0,0 +1 @@ +server |