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.

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@271772 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index 93e08c7ce135735064cf68697676bccf5025beb1..cc3cda9d92f61c1ebbd8b72b1af1e87fdb6be6a6 100755 (executable)
--- 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"