From: Paolo Bonzini <bonzini@gnu.org>
Date: Thu, 31 Jul 2008 08:52:07 +0000 (+0200)
Subject: add a .gitattributes file to use the git-merge-changelog driver
X-Git-Tag: v2.4~36
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/fdd2c97c0b6673599d2d1ea030980799a6abbb59

add a .gitattributes file to use the git-merge-changelog driver
---

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