From a5db52fe6236f35d6704229f600d487d5dbed80b Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Mon, 19 Jul 2021 16:50:32 +0200
Subject: [PATCH] increment_version.sh: exclude "Merge branch" lines

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

diff --git a/increment_version.sh b/increment_version.sh
index 326320c72d..324f36235e 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -146,6 +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 "Automatic color correction" \
         | grep -v "Automatic upstream merge postprocessing" \
         | grep -v "Automatic SchildiChat string correction" \