X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-merge-recursive.py;h=626d85493a64d798dedbdc52b2b0f68d56d447fd;hb=2b2dabc29f53c5835868029585000ee487cf6cbb;hp=b80a860357a4c402c01aeeb7d7974b8d6eafe23e;hpb=79a9d8ea0d88a3667ad19be8e705405ab5d896f1;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index b80a8603..626d8549 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -4,7 +4,7 @@ import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
 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',