Tell git to merge CHANGES.txt in union mode.

bobtemplates.plone does that.
abstract-open-solutions · Sep 11, 2015 · 276df36 · 276df36
1 parent 944a6ff
commit 276df36
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.txt merge=union