Fix typo in automerge script

Change-Id: I41ca4f5cd21b85ead3ae2888d5c1b94cb40f1bd8

diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh
index 2b985309023de35b4e9a4a220fe037affb6acc69..10e6ee0ffbaa44bd4bcb35e6363c5f9c7d270399 100755 (executable)
--- a/scripts/automerge7.sh
+++ b/scripts/automerge7.sh
@@ -109,7 +109,7 @@ do
                         pendingCommit=
                         pendingCommitMessage=
                         echo
-                        echo "Stopping merge because $commit because of merge conflicts"
+                        echo "Stopping merge at $commit because of merge conflicts"
                         echo "The following commit must be manually merged."
                         show $commit
                         exit 3