martin f. krafft: enable automatic changelog merging

[Martin F. Krafft]

Module: mdadm
Branch: master
Commit: cf7eca64e222f7df64f198b88d2d5ddb7684c793
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=cf7eca64e222f7df64f198b88d2d5ddb7684c793

Author: martin f. krafft <madduck at debian.org>
Date:   Thu May 27 11:27:14 2010 +0200

enable automatic changelog merging

---

 .gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs