Since a regression in vimdiff I wrote my own tool and set
MERGE_TOOLS_DIR to use that tool, and ever since then these tests fail.
I've been manually unsetting this variable to run the test suite, but
this is something the testing framework should do.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
t/t7610-mergetool.sh | 2 ++
t/t7800-difftool.sh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 22b3a85b3e..cc99c29c81 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -12,6 +12,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+unset MERGE_TOOLS_DIR
+
# All the mergetool test work by checking out a temporary branch based
# off 'branch1' and then merging in main and checking the results of
# running mergetool
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 59d3847bf8..d78a7ee90b 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -13,6 +13,8 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+unset MERGE_TOOLS_DIR
+
difftool_test_setup ()
{
test_config diff.tool test-tool &&
--
2.40.0+fc1
