diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-10-04 12:02:13 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-10-04 12:02:13 +0300 |
| commit | 31a3f4fccb1a70f673fb166673d3f00a4a3f29ab (patch) | |
| tree | 4ebbfaaac39d853d791f1242bf8078a4051243d4 /scripts | |
| parent | 30484511f88fb29797b0ef8a7e02433f38d15cd3 (diff) | |
| download | vaadin-framework-31a3f4fccb1a70f673fb166673d3f00a4a3f29ab.tar.gz vaadin-framework-31a3f4fccb1a70f673fb166673d3f00a4a3f29ab.zip | |
Fix typo in automerge script
Change-Id: I41ca4f5cd21b85ead3ae2888d5c1b94cb40f1bd8
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 |