From 66affa62a8016479f967d57e0970ad9661f0e1b4 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 11 Sep 2018 11:40:44 +0200
Subject: [PATCH] Improve the management of the merge on debian/changelog

---
 .gitattributes | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..c0bb3fe0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+debian/changelog merge=dpkg-mergechangelogs
+
+#  ~/.gitconfig should have
+# [merge "dpkg-mergechangelogs"]
+# name = debian/changelog merge driver
+# driver = dpkg-mergechangelogs -m %O %A %B %A