Merge branch 'da/difftool' into maint

diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index 7457c743e8d8539c4f08df81f86c8b27c0bce392..88eb8f901367aceffa008cf33b35ca8bee848626 100644 (file)
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -168,7 +168,7 @@ static int command_loop(const char *child)
                size_t i;
                if (!fgets(buffer, MAXCOMMAND - 1, stdin)) {
                        if (ferror(stdin))
-                               die("Comammand input error");
+                               die("Command input error");
                        exit(0);
                }
                /* Strip end of line characters. */