Support custom build options in config.mak

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index b80a860357a4c402c01aeeb7d7974b8d6eafe23e..626d85493a64d798dedbdc52b2b0f68d56d447fd 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -4,7 +4,7 @@
 from heapq import heappush, heappop
 from sets import Set
 
-sys.path.append('@@GIT_PYTHON_PATH@@')
+sys.path.append('''@@GIT_PYTHON_PATH@@''')
 from gitMergeCommon import *
 
 originalIndexFile = os.environ.get('GIT_INDEX_FILE',