build: set merge=union for .patches (#22990)

Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
electron · Apr 7, 2020 · 2426581 · 2426581
1 parent 7586295
commit 2426581
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -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