mirror of
https://github.com/alacritty/alacritty.git
synced 2026-11-21 21:45:04 +03:00
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
|