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) <ernesto.alfonsogonzalez@ge.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed May 3, 2016 at 07:12 UTC f54bea44a58caddaaf83644d95172740e8490206
1 file changed +1 -1
remote.c
+1 -1
@@ -2156,7 +2156,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
2156 "Your branch and '%s' have diverged,\n"
2157 "and have %d and %d different commits each, "
2158 "respectively.\n",
2159 - theirs),
2159 + ours + theirs),
2160 base, ours, theirs);
2161 if (advice_status_hints)
2162 strbuf_addf(sb,