diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-16 21:32:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-16 21:32:44 -0800 |
| commit | 27dedf0c3b78d1072fb5449149421284f9e5297b (patch) | |
| tree | 80da2302f50bb1f396611a4a54a6da52a4592bd0 /git-merge-recursive.py | |
| parent | 60d64db4614b1007ca37c228923ec1964d5ad394 (diff) | |
| download | git-27dedf0c3b78d1072fb5449149421284f9e5297b.tar.gz | |
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
| -rwxr-xr-x | git-merge-recursive.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 1bf73f336d..d7d36aa7d1 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -3,11 +3,13 @@ # Copyright (C) 2005 Fredrik Kuivinen # -import sys, math, random, os, re, signal, tempfile, stat, errno, traceback +import sys +sys.path.append('''@@GIT_PYTHON_PATH@@''') + +import math, random, os, re, signal, tempfile, stat, errno, traceback from heapq import heappush, heappop from sets import Set -sys.path.append('''@@GIT_PYTHON_PATH@@''') from gitMergeCommon import * outputIndent = 0 |