[llvm-branch-commits] [llvm-branch] r271772 - Merging r257663:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri Jun  3 22:43:08 2016
New Revision: 271772

URL: http://llvm.org/viewvc/llvm-project?rev=271772&view=rev
Log:
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.

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

Modified:
    llvm/branches/release_38/utils/release/merge.sh

Modified: llvm/branches/release_38/utils/release/merge.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/utils/release/merge.sh?rev=271772&r1=271771&r2=271772&view=diff
==============================================================================
--- llvm/branches/release_38/utils/release/merge.sh (original)
+++ llvm/branches/release_38/utils/release/merge.sh Fri Jun  3 22:43:08 2016
@@ -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"