From 31a3f4fccb1a70f673fb166673d3f00a4a3f29ab Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 4 Oct 2013 12:02:13 +0300 Subject: Fix typo in automerge script Change-Id: I41ca4f5cd21b85ead3ae2888d5c1b94cb40f1bd8 --- scripts/automerge7.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/automerge7.sh') diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 2b98530902..10e6ee0ffb 100755 --- 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 -- cgit v1.2.3