scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2026-01-10 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
9be345cb8f602d70826c67ee4adb45ede82aaf9f
kubernetes/hack/verify-flags/.gitattributes
Matt Liggett 52f6b27365 Mark known-flags to merge via union. 
This avoids pointless merge conflicts in a simple text file.
Fixes #27088.
2016-06-08 15:59:35 -07:00

2 lines
28 B
Plaintext
Raw Blame History

known-flags.txt merge=union
Reference in New Issue View Git Blame Copy Permalink