Pchen0/electron

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

Co-authored-by: Jeremy Apthorp <[email protected]>

trop[bot] 5 years ago

parent

7586295378

commit

242658102a

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
.gitattributes
							 
								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

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

+ 1 - 0 .gitattributes View File

+ 1 - 0
.gitattributes
View File