diff options
| -rwxr-xr-x | build/bin/mergetool.py | 2 |
1 files changed, 1 insertions, 1 deletions
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/") \ |