From a72ebc4c26bfff26bb772d11d0468856688ac290 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 13 Jun 2023 17:53:05 -0400
Subject: [PATCH] Avoid printing "automatic merge went well" message [skip ci]

---
 scripts/propagate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/propagate.sh b/scripts/propagate.sh
index 0b71434b..23b8a6a0 100755
--- a/scripts/propagate.sh
+++ b/scripts/propagate.sh
@@ -33,7 +33,7 @@ for version in "${all_versions[@]}"; do
     if ! { echo "$version"; echo "$our_version"; } | sort --version-sort --check &>/dev/null; then
         echo -n "merging $our_version into ${version}... "
         git checkout -b propagations/$version origin/$version &>/dev/null
-        if ! git merge --no-commit propagations/$our_version >/dev/null; then
+        if ! git merge --no-commit propagations/$our_version &>/dev/null; then
             merge_failed=yes
             echo "failed, this merge must be done manually using the provided shell"
         else