diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:42 -0700 |
| commit | 919e06b2288270f47c55759e8810b87f74609caf (patch) | |
| tree | 2fe295a61f1d61e56db0626ec33131375c2152f8 /git-difftool.perl | |
| parent | Merge branch 'jn/gitweb-fastcgi' (diff) | |
| parent | Remove python 2.5'isms (diff) | |
| download | tgif-919e06b2288270f47c55759e8810b87f74609caf.tar.xz | |
Merge branch 'bc/portable'
* bc/portable:
Remove python 2.5'isms
Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
t/aggregate-results: accomodate systems with small max argument list length
t/t7006: ignore return status of shell's unset builtin
t/t5150: remove space from sed script
git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
t/t5800: skip if python version is older than 2.5
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions