2 commits

Author	SHA1	Message	Date
Jeremy Apthorp	5b53f1a39c	build: set merge=union for .patches (#22985)	2020-04-06 15:15:35 -07:00
Jeremy Apthorp	442f05dfe7	chore: force patches to be checked out with LF line endings (#14789)	2018-09-26 02:04:32 +12:00