github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
trop[bot]
2020-04-07 09:55:17 -07:00
committed by GitHub
parent 41f33edd9e
commit 8a4d41cd46
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -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