dgit: Set up a merge driver for debian/changelog. Closes:#769291.

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 49b8777a7f1cb518cc0e7e7b31267f2b5efd279a..9e8f572946ace82064a3249205c11dada4a009ca 100644 (file)
--- 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.
 
  --