From 21e22ad709e16a8943268754eccfa6b536b8322b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 4 Jun 2016 03:43:08 +0000 Subject: Merging r257663: ------------------------------------------------------------------------ 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 --- llvm/utils/release/merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.1