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

Message fix. * nd/remote-plural-ours-plus-theirs: remote.c: specify correct plural form in "commit diverge" message

Junio C Hamano committed May 26, 2016 at 13:17 UTC 4e327bb4c251fc642660e35252543c830d2ca2b7

No changes.