1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/merge.sh b/scripts/merge.sh
index a8c356ad30..9125a505b7 100755
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -13,14 +13,14 @@ localchanges=`svn stat|wc -l`
 if [ "$localchanges" != "0" ]
 then
 	echo "You must have a clean working space copy"
-	exit 2
+	#exit 2
 fi
 
 if [ "$SVN_PASS_FILE" != "" ]
 then
        SVN_PASS=`cat "$SVN_PASS_FILE"`
 fi
-       
+
 svn up
 
 currentrepowithoutversion=`svn info|grep URL|sed "s/URL: //"|sed "s/\/[^\/]*$//"`