From: Marko Grönroos <magi@iki.fi>
Date: Mon, 1 Mar 2010 14:46:39 +0000 (+0000)
Subject: Merge tool bug fix.
X-Git-Tag: 6.7.0.beta1~2016
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9836f0d7f3ddde49f1865d434e87b948cc277a6b;p=vaadin-framework.git

Merge tool bug fix.

svn changeset:11562/svn branch:6.3
---

diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py
index 7ed1cb1579..c22fd952bc 100755
--- a/build/bin/mergetool.py
+++ b/build/bin/mergetool.py
@@ -82,7 +82,7 @@ def listChangedFiles():
 		line = line[:-1]
 
 		# Extract the file state and name
-		(filestate, filename) = re.split(r'[ \+]+', line)
+		(filestate, filename) = re.split(r'[ \+]+', line.lstrip())
 
 		# Ignore files in build directory
 		if (filename.startswith("build/merge/") \