summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-01-09 15:12:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-01-09 15:12:52 -0400
commit9de1192c574dc304f3e9dbfd01296f74c7ea5969 (patch)
treef651cd1d70bd57b97b881b3e34eb78aa4b934fef /.gitattributes
parentfd3efc086a98e298faff458aa64c2fe811081c5f (diff)
enable dpkg-mergechangelogs
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index b98b07d7d..5d425843f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.git-annex/*.log merge=union
+debian/changelog merge=dpkg-mergechangelogs