Create a new test case file for the different available merge tools. Right now it only tests the 'mergetool.vimdiff.layout' options. Other merge tools might be interested in adding their own tests here too. Signed-off-by: Fernando Ramos <greenfoo@xxxxxx> --- t/t7609-mergetool--lib.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 t/t7609-mergetool--lib.sh diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh new file mode 100755 index 0000000000..8cfc22e27c --- /dev/null +++ b/t/t7609-mergetool--lib.sh @@ -0,0 +1,15 @@ +#!/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 + -- 2.34.0