From: Nguyễn Thái Ngọc Duy Date: Tue, 3 May 2016 00:12:30 +0000 (+0700) Subject: remote.c: specify correct plural form in "commit diverge" message X-Git-Tag: v2.9.0-rc0~35^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f54bea44a58caddaaf83644d95172740e8490206;p=thirdparty%2Fgit.git remote.c: specify correct plural form in "commit diverge" message We need to count both "ours" and "theirs" commits when selecting plural form for this message. Note that even though in this block, both ours and theirs must be positive (i.e. can't be in singular form), we still keep Q_(singular, plural) because languages other than English may have more than one plural form. Reported-by: Alfonsogonzalez, Ernesto (GE Digital) Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/remote.c b/remote.c index ee6edfa335..21408463bb 100644 --- a/remote.c +++ b/remote.c @@ -2156,7 +2156,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,