[Git] Adds union merge strategy.

Moya · Nov 16, 2015 · c06be6e · c06be6e
1 parent 72f2f54
commit c06be6e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+Changelog.md merge=union
+