kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67677 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: 776515ef8b
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '776515ef8b'
${ noResults }
git/t/t7609-mergetool--lib.sh

15 lines
276 B
Raw Blame History

#!/bin/sh
test_description='git mergetool
Testing basic merge tools options'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'mergetool --tool=vimdiff creates the expected layout' '
. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
run_unit_tests
'
test_done