Merge branch 'nd/remote-plural-ours-plus-theirs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:24 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:24 +0000 (14:38 -0700)
commit7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6
tree3dd0b6564f059047113b85e560d9a7d5d5494a67
parent34698baa5bad6acc2e8d699a2a6ceb6ff6cede50
parentf54bea44a58caddaaf83644d95172740e8490206
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
remote.c