git/t/t7609-mergetool--lib.sh

#!/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
vimdiff: integrate layout tests in the unit tests framework ('t' folder) Create a new test case file for the different available merge tools. Right now it only tests the 'mergetool.vimdiff.layout' option. Other merge tools might be interested in adding their own tests here too. Signed-off-by: Fernando Ramos <greenfoo@u92.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-03-30 19:19:07 +00:00			`#!/bin/sh`

			`test_description='git mergetool`

			`Testing basic merge tools options'`

			`. ./test-lib.sh`

			`test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '`
tests: add missing double quotes to included library paths Fix inclusion errors which would occur if the $TEST_DIRECTORY had $IFS whitespace in it. See d42bab442d7 (core.fsyncmethod: tests for batch mode, 2022-04-04) and a242c150ebb (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> 2022-06-30 10:18:34 +00:00			`. "$GIT_BUILD_DIR"/mergetools/vimdiff &&`
vimdiff: integrate layout tests in the unit tests framework ('t' folder) Create a new test case file for the different available merge tools. Right now it only tests the 'mergetool.vimdiff.layout' option. Other merge tools might be interested in adding their own tests here too. Signed-off-by: Fernando Ramos <greenfoo@u92.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-03-30 19:19:07 +00:00			`run_unit_tests`
			`'`

			`test_done`