mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
15 lines
243 B
Bash
15 lines
243 B
Bash
|
#!/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
|