diff options
Diffstat (limited to 'build/bin/mergetool.py')
| -rwxr-xr-x | build/bin/mergetool.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py index 91d9d5105c..7ed1cb1579 100755 --- a/build/bin/mergetool.py +++ b/build/bin/mergetool.py @@ -79,12 +79,10 @@ def listChangedFiles(): changed = [] for line in lines: # Remove trailing newline - line = line.rstrip() - print line - + line = line[:-1] + # Extract the file state and name - filestate = line[0:2].strip() - filename = line[7:].strip() + (filestate, filename) = re.split(r'[ \+]+', line) # Ignore files in build directory if (filename.startswith("build/merge/") \ @@ -543,8 +541,7 @@ def commandRevert(): line = line[:-1] # Extract the file state and name - filestate = line[0:2].strip() - filename = line[7:].strip() + (filestate, filename) = re.split(r'[ \+]+', line) # Ignore files in build directory if (filename.startswith("build/merge/") \ |