summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:17:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:17:27 +0000
commit7b3d5890037484a6ee4573744869f28301902a8b (patch)
tree421062658afbf3303827539a888f86d5f73432ba /.gitattributes
parentReleasing progress-linux version 13.16-0.0~progress7.99u1. (diff)
downloaddebhelper-7b3d5890037484a6ee4573744869f28301902a8b.tar.xz
debhelper-7b3d5890037484a6ee4573744869f28301902a8b.zip
Merging upstream version 13.17.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.gitattributes')
-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