From ccb49c6c70920b072e82ff4af7008cf3e0cbd66d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 2 Mar 2022 16:14:22 +0100
Subject: [PATCH] increment_version.sh: Exclude more merge-related commits

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

diff --git a/increment_version.sh b/increment_version.sh
index a519457d80..932f36ab90 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -158,7 +158,7 @@ git_changelog() {
         | grep -v "Added translation using Weblate" \
         | grep -v "Translated using Weblate" \
         | grep -v "weblate/sc" \
-        | grep -v "\\[merge.*\\]" \
+        | grep -v "\\[.*merge.*\\]" \
         | grep -v "Disable Android Auto supports" \
         || echo "No significant changes since the last stable release"
 }