github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-05 15:37:35 +00:00
Code Issues Projects Releases Wiki Activity
Files
a74ec3f90a2e9e7ce38f4e90b732373623eeb51a
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