upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-04-28 01:30:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
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

1 line
28 B
Text
Raw Blame History

known-flags.txt merge=union
Reference in a new issue View git blame Copy permalink