summaryrefslogtreecommitdiff
path: root/releasenotes/notes/merge-conflict-rename-da402e1c8685949b.yaml
Commit message (Expand)AuthorAgeFilesLines
* Rename MERGER_FAILURE to MERGE_CONFLICTJames E. Blair2022-02-241-0/+30