summaryrefslogtreecommitdiff
path: root/tests/fixtures/layouts/merge-conflict.yaml
Commit message (Expand)AuthorAgeFilesLines
* Rename MERGER_FAILURE to MERGE_CONFLICTJames E. Blair2022-02-241-0/+82