diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-11 00:50:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-11 00:51:52 +0400 |
| commit | 4769948afe7c502d37746edc2ee2c084c9dcb325 (patch) | |
| tree | cb6045a7e6dc192bfce076ed8c1bab3795822b5d /git-merge-recursive.py | |
| parent | d5b0c9ea178dab3599674ccff50645c0464b8c31 (diff) | |
Deal with $(bindir) and friends with whitespaces.
... using HPA's shellquote macro.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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', |