diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
commit | c8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch) | |
tree | 24e09d9f84dec336720cf393e156089ca2835791 /t/t7609-mergetool--lib.sh | |
parent | Initial commit. (diff) | |
download | git-17a789943131483bc454986d1be6da6caaabce8c.tar.xz git-17a789943131483bc454986d1be6da6caaabce8c.zip |
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 't/t7609-mergetool--lib.sh')
-rwxr-xr-x | t/t7609-mergetool--lib.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t7609-mergetool--lib.sh b/t/t7609-mergetool--lib.sh new file mode 100755 index 0000000..8b1c3bd --- /dev/null +++ b/t/t7609-mergetool--lib.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +test_description='git mergetool + +Testing basic merge tools options' + +TEST_PASSES_SANITIZE_LEAK=true +. ./test-lib.sh + +test_expect_success 'mergetool --tool=vimdiff creates the expected layout' ' + . "$GIT_BUILD_DIR"/mergetools/vimdiff && + run_unit_tests +' + +test_done |