diff options
| author | Marko Grönroos <magi@iki.fi> | 2010-03-01 14:46:39 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2010-03-01 14:46:39 +0000 |
| commit | 9836f0d7f3ddde49f1865d434e87b948cc277a6b (patch) | |
| tree | 41a00478b9f1e200565dc7972dc5e3fb2b91ec02 /build/bin | |
| parent | fa74571bfbb441d901272cea65a95ea9cb1a356c (diff) | |
| download | vaadin-framework-9836f0d7f3ddde49f1865d434e87b948cc277a6b.tar.gz vaadin-framework-9836f0d7f3ddde49f1865d434e87b948cc277a6b.zip | |
Merge tool bug fix.
svn changeset:11562/svn branch:6.3
Diffstat (limited to 'build/bin')
| -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/") \ |