aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorHenrik Tjäder <henrik@grepit.se>2022-02-15 19:51:54 +0100
committerHenrik Tjäder <henrik@grepit.se>2022-02-15 19:51:54 +0100
commit5f3c5f7f2c58da9c9b87c7da6b0507cd08fcb96f (patch)
tree1826980142be99cfeb7a2824d00264eccf00a8c0 /.gitattributes
parent5a186feb16b2800d86a4861084207e720a442ee3 (diff)
CHANGELOG merge=union
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a19ade0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union