summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-08 14:25:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-08 14:25:12 -0700
commit41eae3eaa81c5f2b61b2610ed74de15c4291b318 (patch)
tree1dd8fa62e1a67ba904facaf4b028d7e553a83e83 /fmt-merge-msg.h
parentMerge branch 'bc/doc-credential-helper-value' (diff)
parentt/t0000-basic: make sure subtests also use TEST_SHELL_PATH (diff)
downloadtgif-41eae3eaa81c5f2b61b2610ed74de15c4291b318.tar.xz
Merge branch 'cb/t0000-use-the-configured-shell'
The basic test did not honor $TEST_SHELL_PATH setting, which has been corrected. * cb/t0000-use-the-configured-shell: t/t0000-basic: make sure subtests also use TEST_SHELL_PATH
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions