Skip to content

Commit a242c15

Browse files
greenfoogitster
authored andcommitted
vimdiff: integrate layout tests in the unit tests framework ('t' folder)
Create a new test case file for the different available merge tools. Right now it only tests the 'mergetool.vimdiff.layout' option. Other merge tools might be interested in adding their own tests here too. Signed-off-by: Fernando Ramos <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0041797 commit a242c15

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

t/t7609-mergetool--lib.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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

0 commit comments

Comments
 (0)