Merge tool bug fix.

svn changeset:11562/svn branch:6.3

diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py
index 7ed1cb157945c92f9f2c15f037d8a212bd3dbed6..c22fd952bcb933f9e527113efb16f6ec60169f0f 100755 (executable)
--- 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/") \