| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-02-15 | Add custom merge strategy for CHANGELOG.md | Christian Duerr | |
| 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. | |||
 |
index : alacritty | |
| Mirror of https://github.com/alacritty/alacritty | matthias |
| summaryrefslogtreecommitdiffstats |
path: root/.gitattributes