From cc13771675f83624a7d850b73f92e43e085b71c8 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 13 Jun 2012 09:35:41 +0200
Subject: [PATCH] Fix generated ChangeLog entry.

--
Finally Jim's git-fix-log thingy comes handy.
---
 scripts/git-log-fix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/git-log-fix b/scripts/git-log-fix
index af702fe6f..6760e8632 100644
--- a/scripts/git-log-fix
+++ b/scripts/git-log-fix
@@ -1,3 +1,10 @@
 # This file is expected to be used via gitlog-to-changelog's --amend=FILE
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
+
+08178d1e130a856622c0b938a34eb109bde79262
+s/Conflicts:/--/
+
+dafa7aa621dfe36c5c6cf462d3ec0d6c614ab105
+# Fix old cherry-picked message.
+s/(fix wLangId in.*)/\1\n--/