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

Junio C Hamano committed May 17, 2016 at 14:38 UTC 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6

No changes.