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 | 21e22ad709e16a8943268754eccfa6b536b8322b (patch) | |
tree | ed3ae8942781c696b01f53ff12e7e2552383eee0 | |
parent | bd5e44312c3317fb5a168751dea297b808e3e9f7 (diff) | |
download | llvm-21e22ad709e16a8943268754eccfa6b536b8322b.zip llvm-21e22ad709e16a8943268754eccfa6b536b8322b.tar.gz llvm-21e22ad709e16a8943268754eccfa6b536b8322b.tar.bz2 |
Merging r257663:llvmorg-3.8.1-rc1llvmorg-3.8.1
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
llvm-svn: 271772
-rwxr-xr-x | llvm/utils/release/merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh index 93e08c7..cc3cda9 100755 --- a/llvm/utils/release/merge.sh +++ b/llvm/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" |