diff options
Diffstat (limited to 'git-merge-recursive.py')
| -rwxr-xr-x | git-merge-recursive.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index b80a860357..626d85493a 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', |