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
2016-05-17 14:38:24 -07:00 · 2016-05-17 14:38:24 -07:00 · 7a7d0854ff
commit 7a7d0854ff
parent 34698baa5b f54bea44a5
1 changed files with 1 additions and 1 deletions
--- 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,