| 12345678910 |
- # Avoids changelog conflicts by assuming additions-only, which is by far the common case.
- # In the rare case where branch b1 rebases against branch b2 and both branches
- # modified the same changelog entry, you'll end up with that changelog entry
- # duplicated, which is easily identifiable and fixable.
- /changelog.md merge=union
- # bug https://github.com/dom96/choosenim/issues/256 for WSL CRLF
- *.sh text eol=lf
- /config/build_config.txt text eol=lf
|
