262073-fix-merge-conflict-button-text-none.yml\unreleased\changelogs - delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

index : delta/gitlab/gitlab-ce.git

gitlab.com: gitlab-org/gitlab-ce.git

summary refs log tree commit diff

path: root/changelogs/unreleased/262073-fix-merge-conflict-button-text-none.yml

blob: 2c819d7485d60bce7186c495af929fc876bbdff8 (plain)

---
title: Fix merge conflict button text if "None" code style selected
merge_request: 44427
author: David Barr @davebarr
type: fixed