connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

diff --git a/unpack-trees.c b/unpack-trees.c
index b90c5407267c426ca733ce38d78d913269ea1afa..129d49ff4517ae0f6c843a9f53c1617f3c2cb3ca 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -78,7 +78,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
                xstrfmt(msg, cmd, cmd);
 
        msgs[ERROR_NOT_UPTODATE_DIR] =
-               _("Updating the following directories would lose untracked files in it:\n%s");
+               _("Updating the following directories would lose untracked files in them:\n%s");
 
        if (!strcmp(cmd, "checkout"))
                msg = advice_commit_before_merge