mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
a242c150eb
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>
15 lines
243 B
Bash
Executable file
15 lines
243 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
|