Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:18 +0000 (13:17 -0700)
commit4e327bb4c251fc642660e35252543c830d2ca2b7
tree86165966f1af2b431adbd06c51da62f5c4627f48
parente8c7b8cf683bcaecfca21a9dd7c9464c50b4d1dd
parentf54bea44a58caddaaf83644d95172740e8490206
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
remote.c