2018-09-25 14:04:32 +00:00
|
|
|
# `git apply` and friends don't understand CRLF, even on windows. Force those
|
|
|
|
|
# files to be checked out with LF endings even if core.autocrlf is true.
|
|
|
|
|
*.patch text eol=lf
|
2020-04-06 22:15:35 +00:00
|
|
|
patches/**/.patches merge=union
|
