diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-20 02:47:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 02:47:54 (GMT) |
| commit | 343d35c9166cf1713eb2787c3506fd2663466262 (patch) | |
| tree | bed6058fd6ea00ac10528621ea5ac3788e1f4da1 /gitMergeCommon.py | |
| parent | 0a2ba73860211efec479396c33ba381056715be5 (diff) | |
| download | git-343d35c9166cf1713eb2787c3506fd2663466262.zip git-343d35c9166cf1713eb2787c3506fd2663466262.tar.gz git-343d35c9166cf1713eb2787c3506fd2663466262.tar.bz2 | |
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>
Diffstat (limited to 'gitMergeCommon.py')
| -rw-r--r-- | gitMergeCommon.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gitMergeCommon.py b/gitMergeCommon.py index 3af4fbd..7e8855c 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 |