| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Add custom merge strategy for CHANGELOG.md | Christian Duerr | 2020-02-15 |
| 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 : r-alacritty.git | |
| My custom-patched version of alacritty. |
| aboutsummaryrefslogtreecommitdiff |
path: root/.gitattributes