Skip to content
Snippets Groups Projects
Commit 21e22ad7 authored by Tom Stellard's avatar Tom Stellard
Browse files

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
parent bd5e4431
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ rev="" ...@@ -18,7 +18,7 @@ rev=""
proj="" proj=""
revert="no" revert="no"
function usage() { usage() {
echo "usage: `basename $0` [OPTIONS]" echo "usage: `basename $0` [OPTIONS]"
echo " -proj PROJECT The project to merge the result into" echo " -proj PROJECT The project to merge the result into"
echo " -rev NUM The revision to merge into the project" echo " -rev NUM The revision to merge into the project"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment