Merge branch 'ls/p4-lfs'

diff --git a/fetch-pack.c b/fetch-pack.c
index cb45c346ea97059b66642b458c7ca372ece67aaa..601f0779a1903a2b860412e3404e4ea8e4bce573 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -240,7 +240,7 @@ static enum ack_type get_ack(int fd, unsigned char *result_sha1)
                        return ACK;
                }
        }
-       die(_("git fetch_pack: expected ACK/NAK, got '%s'"), line);
+       die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);
 }
 
 static void send_request(struct fetch_pack_args *args,