stephan2012
diff --git a/‎.gitattributes
Lines changed: 2 additions & 0 deletions b/‎.gitattributes
Lines changed: 2 additions & 0 deletions
diff --git a/‎hack/verify-flags/.gitattributes
Lines changed: 0 additions & 1 deletion b/‎hack/verify-flags/.gitattributes
Lines changed: 0 additions & 1 deletion
diff --git a/‎test/.gitattributes
Lines changed: 0 additions & 1 deletion b/‎test/.gitattributes
Lines changed: 0 additions & 1 deletion
@@ -0,0 +1,2 @@
+hack/verify-flags/known-flags.txt merge=union
+test/test_owners.csv merge=union
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+hack/verify-flags/known-flags.txt merge=union`
	`2`	`+test/test_owners.csv merge=union`