diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2016-06-04 03:43:08 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2016-06-04 03:43:08 +0000 |
| commit | 051e787f26dbfdc26cf61a57bc82ca00dcb812e8 (patch) | |
| tree | b6cf372f3d7fbe993b04877312f67d824e5a1aa2 | |
| parent | 949dd370c9718ede195ecdf9c60d520d1088d374 (diff) | |
| download | llvm-release_38.tar.gz | |
Merging r257663:release_38
------------------------------------------------------------------------
r257663 | dimitry | 2016-01-13 11:48:50 -0800 (Wed, 13 Jan 2016) | 4 lines
Remove bashism from merge.sh: POSIX sh does not have the `function`
reserved word, and it is even superfluous in bash, for this particular
instance.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@271772 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | utils/release/merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/release/merge.sh b/utils/release/merge.sh index 93e08c7ce135..cc3cda9d92f6 100755 --- a/utils/release/merge.sh +++ b/utils/release/merge.sh @@ -18,7 +18,7 @@ rev="" proj="" revert="no" -function usage() { +usage() { echo "usage: `basename $0` [OPTIONS]" echo " -proj PROJECT The project to merge the result into" echo " -rev NUM The revision to merge into the project" |