summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-26 13:17:18 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-26 13:17:18 -0700
commit4e327bb4c251fc642660e35252543c830d2ca2b7 (patch)
tree86165966f1af2b431adbd06c51da62f5c4627f48
parente8c7b8cf683bcaecfca21a9dd7c9464c50b4d1dd (diff)
parentf54bea44a58caddaaf83644d95172740e8490206 (diff)
downloadgit-4e327bb4c251fc642660e35252543c830d2ca2b7.tar.gz
Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message
-rw-r--r--remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index ddc4f8fd48..a326e4e251 100644
--- a/remote.c
+++ b/remote.c
@@ -2108,7 +2108,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, "
"respectively.\n",
- theirs),
+ ours + theirs),
base, ours, theirs);
if (advice_status_hints)
strbuf_addf(sb,