repo.or.cz
/
git
/
debian.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'vd/sparse-reset-checkout-fixes' into sy/sparse-rm
[git/debian.git]
/
t
/
t7609-mergetool--lib.sh
blob
330d6d603d77236788ee932cdcc288731a7aa388
1
#!/bin/sh
2
3
test_description
=
'git mergetool
4
5
Testing basic merge tools options'
6
7
. .
/
test-lib.sh
8
9
test_expect_success
'mergetool --tool=vimdiff creates the expected layout'
'
10
. "
$GIT_BUILD_DIR
"/mergetools/vimdiff &&
11
run_unit_tests
12
'
13
14
test_done