Fixed change list parsing problem in merge tool.

svn changeset:7252/svn branch:6.0

diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py
index 7ed1cb157945c92f9f2c15f037d8a212bd3dbed6..ef13448760b9a8bd847c24a52adfa247f218080b 100755 (executable)
--- a/build/bin/mergetool.py
+++ b/build/bin/mergetool.py
@@ -81,7 +81,11 @@ def listChangedFiles():
                # Remove trailing newline
                line = line[:-1]
 
+               # Remove possible space character in the beginning of line
+               line = line.lstrip()
+
                # Extract the file state and name
+               print line
                (filestate, filename) = re.split(r'[ \+]+', line)
 
                # Ignore files in build directory