repo.or.cz
/
git.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 'jk/repack-leakfix'
[git.git]
/
t
/
t7609-mergetool--lib.sh
blob
8b1c3bd39f2249417099ea2f24218268925909af
1
#!/bin/sh
2
3
test_description
=
'git mergetool
4
5
Testing basic merge tools options'
6
7
TEST_PASSES_SANITIZE_LEAK
=
true
8
. .
/
test-lib.sh
9
10
test_expect_success
'mergetool --tool=vimdiff creates the expected layout'
'
11
. "
$GIT_BUILD_DIR
"/mergetools/vimdiff &&
12
run_unit_tests
13
'
14
15
test_done