summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-06-13 22:14:43 +0900
committerSean Whitton <spwhitton@spwhitton.name>2016-06-13 22:14:43 +0900
commitccbedfa1c0bea5f974903123e6f2373ee077dbc1 (patch)
tree5a13df4edd23583f6c4b8660dea152706d4a2260
parentafcc9d9914bf9a779a95a0fb8520848e54729926 (diff)
preemptively add dpkg-mergechangelogs setup
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs