From 343d35c9166cf1713eb2787c3506fd2663466262 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Sep 2005 19:47:54 -0700 Subject: Ship our own copy of subprocess.py so people without the latest Python could run merge-recursive. Signed-off-by: Junio C Hamano --- gitMergeCommon.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gitMergeCommon.py') diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 3af4fbd153..7e8855c617 100644 --- a/gitMergeCommon.py +++ b/gitMergeCommon.py @@ -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 -- cgit v1.2.3