document the fix of #670456

diff --git a/debian/changelog b/debian/changelog
index 79faac10f9994f69f581f60457ce14631bc804a7..43e110f516f9ff2cfc7ae526289c13e2f841dacd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low
   * Fix lack of archive support in pkgindex.cgi.
   * Output notice to transcript when there is a malformed command.
     (closes: #691573). Thanks to Jonathan Nieder.
+  * Fix failure to forcibly merge/merge when found/fixed is not qualified
+    (closes: #670456). Thanks to Jonathan Nieder and Bernhard Schmidt.
 
   [Thanks to Arnout Engelen: ]
   * Add Homepage (closes: #670555).