X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=9e8f572946ace82064a3249205c11dada4a009ca;hp=49b8777a7f1cb518cc0e7e7b31267f2b5efd279a;hb=d2c91253e64e144d17d0f5a0ce9c72661c43a29c;hpb=62cdc56219b149617af4d303c782f3b37e22a529

diff --git a/debian/changelog b/debian/changelog
index 49b8777a..9e8f5729 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.
 
  --