From b58f9cedbdf551f75afecb2ce198347315b16687 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Mon, 2 Aug 2021 13:59:41 +0200
Subject: [PATCH] increment_version.sh: Exclude more merge commits from
 changelog

Change-Id: Iaaeccb73d0c4b0256b4c7211c3153a639a77eaf7
---
 increment_version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/increment_version.sh b/increment_version.sh
index 85fb2076f0..f655fcaaaa 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -146,7 +146,7 @@ git_changelog() {
         | grep -v 'Automatic revert to unchanged upstream strings' \
         | grep -v 'Automatic upstream merge preparation' \
         | sed "s|Merge tag '\\(.*\\)' into sc|Update codebase to Element \1|" \
-        | grep -v "Merge branch" \
+        | grep -v "Merge .*branch" \
         | grep -v "Automatic color correction" \
         | grep -v "Automatic upstream merge postprocessing" \
         | grep -v "Automatic SchildiChat string correction" \