diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-05-07 09:21:10 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-05-07 09:21:10 +0300 |
| commit | cc995bbe0fd7d3f2c992ff20786f969f4505975b (patch) | |
| tree | 37194e4fa033530ac52b903cba42a83d0bc47558 /scripts | |
| parent | 888d34c55c15f244f0d68f82ae2c46fae24da630 (diff) | |
| download | vaadin-framework-cc995bbe0fd7d3f2c992ff20786f969f4505975b.tar.gz vaadin-framework-cc995bbe0fd7d3f2c992ff20786f969f4505975b.zip | |
Update merge specification for the master branch.
Change-Id: Ia8ad2d2e44e2d29bfa9e2271e4e4cad0a672ec22
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 524b0ff912..8d2cfb5cb8 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -1,7 +1,7 @@ #!/bin/bash -FROM=7.0 -TO=7.1 +FROM=7.1 +TO=master FROM_HEAD=origin/$FROM PUSH="origin HEAD:refs/for/$TO" |