diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 3af4fbd1539dd9979575c71d3e9a5e37ac3b0868..1b5bddd467c3d2265e8204bb90c80a2c53742b4a 100644 (file)
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
file.write(' ')
file.write('\n')
-if sys.version_info[0] < 2 or \
- (sys.version_info[0] == 2 and sys.version_info[1] < 4):
- die('Python version 2.4 required, found', \
- str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \
- str(sys.version_info[2]))
-
import subprocess
# Debugging machinery
# Write the empty tree to the object database and return its SHA1
def writeEmptyTree():
- tmpIndex = os.environ['GIT_DIR'] + '/merge-tmp-index'
+ tmpIndex = os.environ.get('GIT_DIR', '.git') + '/merge-tmp-index'
def delTmpIndex():
try:
os.unlink(tmpIndex)