From 240978db1ece1d6d06a980f2da76b2688f92453a Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 8 Nov 2012 14:38:40 -0800
Subject: [PATCH] document the fix of #670456

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

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).
-- 
2.39.2