Rename CHANGELOG to conform to naming standard.

Adds union merge strategy for CHANGELOG
liato · Mar 13, 2015 · f097e41 · f097e41
1 parent 075d147
commit f097e41
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG merge=union
diff --git a/CHANGES.txt → CHANGELOG b/CHANGES.txt → CHANGELOG