This website requires JavaScript.
Explore
Help
Sign In
mslot
/
alacritty
Watch
1
Star
0
Fork
You've already forked alacritty
0
Code
Issues
Pull Requests
Packages
Projects
Releases
Wiki
Activity
c102e845cd
alacritty
/
.gitattributes
2 lines
26 B
Plaintext
Raw
Normal View
History
Unescape
Escape
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 10:25:02 +00:00
/CHANGELOG.md merge=union