X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-recursive.py;h=d7d36aa7d11299d3a1e91dce1bc9572ac56a7c08;hb=refs%2Ftags%2Fv0.99.9j;hp=1bf73f336d4c34011b9cfe5a13b88a1f657d3f4e;hpb=60d64db4614b1007ca37c228923ec1964d5ad394;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 1bf73f33..d7d36aa7 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