mergetool: run prompt only if guessed tool

diff --git a/connect.c b/connect.c
index 4150412e2c0ebf6129137baf41c9d268d50c60bd..a983d061a90f0b720afa1a9b50247da299164d79 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -727,7 +727,7 @@ struct child_process *git_connect(int fd[2], const char *url,
                                *arg++ = port;
                        }
                        *arg++ = ssh_host;
-               }       else {
+               } else {
                        /* remove repo-local variables from the environment */
                        conn->env = local_repo_env;
                        conn->use_shell = 1;