diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:53:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:54:00 -0800 |
| commit | 8f98074c6a4667325605b043ca0ae6fe3f019c78 (patch) | |
| tree | c8476447af0751f6460fa9365ca69c3475af4839 /merge-file.c | |
| parent | Merge branch 'jc/maint-fbsd-sh-ifs-workaround' (diff) | |
| parent | t9020: use configured Python to run the test helper (diff) | |
| download | tgif-8f98074c6a4667325605b043ca0ae6fe3f019c78.tar.xz | |
Merge branch 'jc/test-portability'
* jc/test-portability:
t9020: use configured Python to run the test helper
t3600: Avoid "cp -a", which is a GNUism
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions