From 02a2eeea5454e35ec4d520b7fd83563f850684b8 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@bec.de>
Date: Wed, 1 Jun 2016 14:11:09 +0000
Subject: [PATCH] Revert unintentional change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@271395 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/release/merge.sh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index b4893224834..93e08c7ce13 100755
--- a/utils/release/merge.sh
+++ b/utils/release/merge.sh
@@ -17,14 +17,12 @@ set -e
 rev=""
 proj=""
 revert="no"
-srcdir=""
 
-usage() {
+function 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"
     echo "  -revert        Revert rather than merge the commit"
-    echo "  -srcdir        The root of the project checkout"
 }
 
 while [ $# -gt 0 ]; do
@@ -37,10 +35,6 @@ while [ $# -gt 0 ]; do
             shift
             proj=$1
             ;;
-        --srcdir | -srcdir | -s)
-            shift
-            srcdir=$1
-            ;;
         -h | -help | --help )
             usage
             ;;
@@ -57,10 +51,6 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-if [ -z "$srcdir" ]; then
-    srcdir="$proj.src"
-fi
-
 if [ "x$rev" = "x" -o "x$proj" = "x" ]; then
     echo "error: need to specify project and revision"
     echo
@@ -82,7 +72,7 @@ else
 fi
 svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1
 
-cd "$srcdir"
+cd $proj.src
 echo "# Updating tree"
 svn up
 
-- 
2.50.1