add merge=union gitattributes for CHANGELOG.md (ROCm#1225)

hcman2 · Nov 12, 2020 · ce86356 · ce86356
1 parent becb32f
commit ce86356
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+/CHANGELOG.md merge=union
+*.pdf binary
+*.doc binary
+*.docx binary
+*.ppt binary
+*.pptx binary
+*.xls binary
+*.xlsx binary
+*.xps binary