releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml


1
2
3
4
5
6

upgrade:
  - |
    The previously deprecated ``merge-failure`` and
    ``merge-failure-message`` pipeline configuration options have been
    removed.  Use ``merge-conflict`` and ``merge-conflict-message``
    respectively instead.