connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 180dd7057a7ca1b8b43586d30187765449ac0596..381b7df452e44622c46c8c3471f181b4568be10a 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -660,7 +660,7 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
        test_config mergetool.myecho.trustExitCode true &&
        test_must_fail git merge master &&
        git mergetool --no-prompt --tool myecho -- both >actual &&
-       test_must_fail grep ^\./both_LOCAL_ actual >/dev/null &&
+       ! grep ^\./both_LOCAL_ actual >/dev/null &&
        grep /both_LOCAL_ actual >/dev/null
 '