mirror of
https://github.com/alacritty/alacritty
synced 2024-09-15 22:10:35 +00:00
a842d6827c
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.
2 lines
26 B
Plaintext
2 lines
26 B
Plaintext
/CHANGELOG.md merge=union
|