mirror of
https://github.com/RPCSX/llvm.git
synced 2026-01-31 01:05:23 +01:00
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
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user