.gitconfig: update

[nethome.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..d4e37a2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=git-merge-changelog