From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 8 Nov 2012 22:38:40 +0000 (-0800)
Subject: document the fix of #670456
X-Git-Tag: release/2.6.0~326
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=240978db1ece1d6d06a980f2da76b2688f92453a

document the fix of #670456
---

diff --git a/debian/changelog b/debian/changelog
index 79faac1..43e110f 100644
--- 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).