From 52f6b27365ba2de7eac4ecdde6ff1d71873dc0ea Mon Sep 17 00:00:00 2001
From: Matt Liggett <mml@google.com>
Date: Wed, 8 Jun 2016 15:58:26 -0700
Subject: [PATCH] Mark known-flags to merge via union.

This avoids pointless merge conflicts in a simple text file.
Fixes #27088.
---
 hack/verify-flags/.gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hack/verify-flags/.gitattributes

diff --git a/hack/verify-flags/.gitattributes b/hack/verify-flags/.gitattributes
new file mode 100644
index 00000000000..c04e4626951
--- /dev/null
+++ b/hack/verify-flags/.gitattributes
@@ -0,0 +1 @@
+known-flags.txt merge=union