diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |