diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:42 -0700 |
| commit | ca158f4633e40fb8a6e7e6b78dc7ad559718a19b (patch) | |
| tree | e1ad86c75391478273f05cbc2e09c16b2857358c /Documentation/merge-config.txt | |
| parent | Merge branch 'sb/config-exit-status-list' (diff) | |
| parent | git-p4 tests: time_in_seconds should use $PYTHON_PATH (diff) | |
| download | tgif-ca158f4633e40fb8a6e7e6b78dc7ad559718a19b.tar.xz | |
Merge branch 'ld/p4-test-py3'
The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.
* ld/p4-test-py3:
git-p4 tests: time_in_seconds should use $PYTHON_PATH
git-p4 tests: work with python3 as well as python2
git-p4 tests: cd to / before running python
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions