From 9836f0d7f3ddde49f1865d434e87b948cc277a6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marko=20Gr=C3=B6nroos?= Date: Mon, 1 Mar 2010 14:46:39 +0000 Subject: [PATCH] Merge tool bug fix. svn changeset:11562/svn branch:6.3 --- build/bin/mergetool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/") \ -- 2.39.5