diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:49 -0700 |
commit | 18a86f32ab91a0be390508c0b3cdc374a00822a0 (patch) | |
tree | 71e5412caf1c4398c7eb09657706555908bbd734 /merge.c | |
parent | Merge branch 'mk/merge-in-sparse-checkout' (diff) | |
parent | t3404: fix use of "VAR=VAL cmd" with a shell function (diff) | |
download | tgif-18a86f32ab91a0be390508c0b3cdc374a00822a0.tar.xz |
Merge branch 'jc/t3404-one-shot-export-fix'
Correct a broken use of "VAR=VAL shell_func" in a test.
* jc/t3404-one-shot-export-fix:
t3404: fix use of "VAR=VAL cmd" with a shell function
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions