mirror of
https://github.com/github/codeql-action.git
synced 2025-12-26 17:20:10 +08:00
9 lines
342 B
Plaintext
9 lines
342 B
Plaintext
lib/*.js linguist-generated=true
|
|
|
|
# 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
|