summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:24 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:24 -0700
commit7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6 (patch)
tree3dd0b6564f059047113b85e560d9a7d5d5494a67 /remote.c
parent34698baa5bad6acc2e8d699a2a6ceb6ff6cede50 (diff)
parentf54bea44a58caddaaf83644d95172740e8490206 (diff)
downloadgit-7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6.tar.gz
Merge branch 'nd/remote-plural-ours-plus-theirs'
Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message
Diffstat (limited to 'remote.c')
-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,