Add option for merging with a merge-commit or keep the merge strategy sets in the repository settings · sequoia-pgp/fast-forward@042cd23