From 221b18992697c67356baeead7fe1216ecc2f71aa Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Mon, 19 Nov 2018 23:20:03 -0800 Subject: [PATCH] Add merge driver for src/*/d/changelog --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..b3a65f48d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# see `man dpkg-mergechangelogs` for usage +src/*/debian/changelog merge=dpkg-mergechangelogs