From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 07 Dec 2017 15:31:33 GMT
Subject: Re: [PATCH] doc: clarify triangular workflow
Message-ID: <xmqqvahieeqy.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <q7h9y3meoghn.fsf@orange.lip.ens-lyon.fr>

Matthieu Moy <Matthieu.Moy@univ-lyon1.fr> writes:

> Not a native speaker, but according to wikipedia
> (https://en.wikipedia.org/wiki/Singular_they) it's OK to write
> "maintainer [singular, but already neulral] may get merge conflicts when
> they [sinugular they] ..."

Yes.