summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-04 22:01:39 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-04 22:16:59 +0100
commitd2c91253e64e144d17d0f5a0ce9c72661c43a29c (patch)
treeea1bfeda1a2b243b5e4e7582c6bac3ae54278a21 /debian
parent62cdc56219b149617af4d303c782f3b37e22a529 (diff)
dgit: Set up a merge driver for debian/changelog. Closes:#769291.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 49b8777..9e8f572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,6 +97,7 @@ dgit (0.23~) unstable; urgency=low
* For non-Debian distros, debiantag() uses distro name a la DEP-14.
* dgit: Be more careful about tag updates during fetch: only update
tags referring to uploads to distro we are trying to fetch from.
+ * dgit: Set up a merge driver for debian/changelog. Closes:#769291.
--