summaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Collapse)Author
2017-09-04use better merge algorithm for CHANGELOG.mdJörg Thalheim
see also: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/