summaryrefslogtreecommitdiff
path: root/.config/git/attributes
diff options
context:
space:
mode:
Diffstat (limited to '.config/git/attributes')
-rw-r--r--.config/git/attributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/attributes b/.config/git/attributes
new file mode 100644
index 0000000..56444aa
--- /dev/null
+++ b/.config/git/attributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog