PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-25 14:05:41 -05:00
Code Releases Activity
alacritty/.gitattributes

2 lines
26 B
Text
Raw Normal View History

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 05:25:02 -05:00
/CHANGELOG.md merge=union
Copy permalink