1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Commit graph

1 commit

Author SHA1 Message Date
Christian Duerr
a842d6827c
Add custom merge strategy for CHANGELOG.md
The merge strategy `union` should hopefully reduce the number of
conflicts when trying to rebase the configuration file, since most of
the changes are simple additions anyways.
2020-02-15 13:25:02 +03:00