New parameter for additionalMergeOptions#157

Open

Iridias wants to merge 6 commits into

aleksandr-m:masterfrom

Iridias:staging

Commits on Feb 14, 2019

support additionalMergeOptions e.g. to specify -Xtheirs
Martin Drößler
committed
updated documentation
Martin Drößler
committed
support different merge-options on release-finish for merging into production-branch and dev-branch
Martin Drößler
committed

Commits on Mar 25, 2019

merged master
Martin Drößler
committed
support different merge-options on hotfix-finish for merging into production-branch and dev-branch
Martin Drößler
committed
updated documentation
Martin Drößler
committed