From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2016 20:17:18 +0000 (-0700)
Subject: Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
X-Git-Tag: v2.9.0-rc1~12^2~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4e327bb4c251fc642660e35252543c830d2ca2b7?ds=inline;hp=--cc

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

4e327bb4c251fc642660e35252543c830d2ca2b7