Merge branch 'jc/t3404-one-shot-export-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:49 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:49 +0000 (14:50 -0700)
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

1  2 
t/t3404-rebase-interactive.sh
Simple merge