| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Implement fine-grained conflict handling | Nikita Popov | 2019-02-20 | 1 | -0/+1 |
| Tests can specify conflict keys, either in --CONFLICTS-- or a per-directory CONFLICTS file. Non-conflicting tests may be run in parallel. | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |