undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/remote-plural-ours-plus-theirs' into maint

Browse Source 
Message fix.

* nd/remote-plural-ours-plus-theirs:
  remote.c: specify correct plural form in "commit diverge" message
This commit is contained in:
Junio C Hamano 2016-05-26 13:17:18 -07:00
commit 4e327bb4c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
remote.c
View File

@ -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,