[
https://issues.jenkins-ci.org/browse/JENKINS-12722?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Christian Wolfgang resolved JENKINS-12722.
--
Resolution: Fixed
> Merge conflict - error message
>
[
https://issues.jenkins-ci.org/browse/JENKINS-12722?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Christian Wolfgang closed JENKINS-12722.
> Merge conflict - error message
> --
>
>
Christian Wolfgang created JENKINS-12722:
Summary: Merge conflict - error message
Key: JENKINS-12722
URL: https://issues.jenkins-ci.org/browse/JENKINS-12722
Project: Jenkins
Issue Typ
