Ship our own copy of subprocess.py
so people without the latest Python could run merge-recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@ -11,12 +11,6 @@ def printList(list, file=sys.stdout):
|
||||
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
|
||||
|
Reference in New Issue
Block a user