upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-10 17:35:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mark known-flags to merge via union.

Browse source 
This avoids pointless merge conflicts in a simple text file.
Fixes #27088.
This commit is contained in:
Matt Liggett 2016-06-08 15:58:26 -07:00
parent e79f046990
commit 52f6b27365
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hack/verify-flags/.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
known-flags.txt merge=union