diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 1bf73f336d4c34011b9cfe5a13b88a1f657d3f4e..d7d36aa7d11299d3a1e91dce1bc9572ac56a7c08 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
# 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