build: set merge=union for .patches (#22985)
This commit is contained in:
parent
ccf70326c0
commit
5b53f1a39c
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
@ -1,3 +1,4 @@
|
|||
# `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
|
||||
patches/**/.patches merge=union
|
||||
|
|
Loading…
Reference in a new issue