From 899168e84c7523719fee5c7396bfcb13040d0176 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 1 Aug 2021 09:32:52 +0200
Subject: [PATCH] increment_version.sh: Exclude merge-specific changes from
 changelog

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

diff --git a/increment_version.sh b/increment_version.sh
index 324f36235e..85fb2076f0 100755
--- a/increment_version.sh
+++ b/increment_version.sh
@@ -156,6 +156,7 @@ git_changelog() {
         | grep -v "Added translation using Weblate" \
         | grep -v "Translated using Weblate" \
         | grep -v "weblate/sc" \
+        | grep -v "\\[merge.*\\]" \
         || echo "No significant changes since the last stable release"
 }