Welcome to mirror list, hosted at ThFree Co, Russian Federation.

t7609-mergetool--lib.sh « t - git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 330d6d603d77236788ee932cdcc288731a7aa388 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
#!/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