Skip to content

K
k3s
Commit 52f6b273 authored by Matt Liggett's avatar Matt Liggett
Browse files
Options

Mark known-flags to merge via union.

This avoids pointless merge conflicts in a simple text file. Fixes #27088.
parent e79f0469
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
hack/verify-flags/.gitattributes 0 → 100644
View file @ 52f6b273
known-flags.txt merge=union
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment