From 7399f56607d789b2152b9461397b93b8db88ccff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Jun 2010 13:43:02 -0400 Subject: [PATCH] auto changelog merging --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..5d425843f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs -- 2.26.2