mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
386e7a9d30
Fix inclusion errors which would occur if the $TEST_DIRECTORY had $IFS whitespace in it. Seed42bab442d(core.fsyncmethod: tests for batch mode, 2022-04-04) anda242c150eb(vimdiff: integrate layout tests in the unit tests framework ('t' folder), 2022-03-30) for the two relevant commits. Both were first released with v2.37.0-rc0 (and were also part of v2.37.0). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 lines
245 B
Bash
Executable file
15 lines
245 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git mergetool
|
|
|
|
Testing basic merge tools options'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
|
|
. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
|
|
run_unit_tests
|
|
'
|
|
|
|
test_done
|