projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Deal with $(bindir) and friends with whitespaces.
[git.git]
/
git-merge-recursive.py
diff --git
a/git-merge-recursive.py
b/git-merge-recursive.py
index
b80a860
..
626d854
100755
(executable)
--- 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',