From 59826767eb12add61e1c976be1c80fd5bff26baf Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannes.dahlstrom@vaadin.com>
Date: Tue, 13 Mar 2012 09:18:53 +0000
Subject: [merge from 6.7] fixes #8505

svn changeset:23227/svn branch:6.8
---
 scripts/merge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

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/\/[^\/]*$//"`
-- 
cgit v1.2.3