 JP Simard
|
99f6430838
|
perform union merges on CHANGELOG.md
this should resolve conflicts more sensibly
See https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
for details
|
2017-02-09 17:11:45 -08:00 |
|