From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:24 +0000 (-0700)
Subject: Merge branch 'nd/remote-plural-ours-plus-theirs'
X-Git-Tag: v2.9.0-rc0~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6?hp=--cc

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

7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6