2020-04-28 17:46:47 +03:00
|
|
|
lib/*.js linguist-generated=true
|
2021-09-02 17:12:31 +03:00
|
|
|
.github/workflows/__* linguist-generated=true
|
2021-05-20 19:23:30 +03:00
|
|
|
|
|
|
|
|
# Reduce incidence of needless merge conflicts on CHANGELOG.md
|
|
|
|
|
# The man page at
|
|
|
|
|
# https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitattributes.html
|
|
|
|
|
# suggests that this might interleave lines arbitrarily, but empirically
|
|
|
|
|
# it keeps added chunks contiguous
|
|
|
|
|
CHANGELOG.md merge=union
|
