From: Ximin Luo <infinity0@debian.org>
Date: Wed, 9 Aug 2017 12:53:09 +0000 (+0200)
Subject: Add .gitattributes for easy changelog merging
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~34
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2f2fe1e61f97458dc1da81aaebc26cbfbdd9ef8;p=ocaml.git

Add .gitattributes for easy changelog merging
---

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