Use union merge strategy for CHANGES.

getsentry · May 12, 2016 · bbddfe1 · bbddfe1
1 parent 1f9ac9f
commit bbddfe1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES merge=union