diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
| commit | 123dfdff0d6e886ce5536d39dd77dcd46db8d4c0 (patch) | |
| tree | f4773e28ec45311814abcd32f94ab581a2a24895 /t | |
| parent | c237c3fd5f038802f3d390c2e1aba9d0fd2f1fd9 (diff) | |
| parent | 980145f7470e20826ca22d7343494712eda9c81d (diff) | |
Merge branch 'fr/vimdiff-layout'
Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.
* fr/vimdiff-layout:
mergetools: add description to all diff/merge tools
vimdiff: add tool documentation
vimdiff: integrate layout tests in the unit tests framework ('t' folder)
vimdiff: new implementation with layout support
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7609-mergetool--lib.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh new file mode 100755 index 0000000000..d848fe6442 --- /dev/null +++ b/t/t7609-mergetool--lib.sh @@ -0,0 +1,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 |