diff options
Diffstat (limited to 'build/bin/mergetool.py')
| -rwxr-xr-x | build/bin/mergetool.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py index 7ed1cb1579..ef13448760 100755 --- 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 |