From: Felipe Contreras Date: Sun, 07 May 2023 22:25:37 GMT Subject: Re: [PATCH] doc: merge: improve conflict presentation docs Message-ID: <645825614027d_4e612949f@chronos.notmuch> In-Reply-To: Elijah Newren wrote: > On Fri, May 5, 2023 at 6:58 AM Adam Johnson via GitGitGadget > wrote: > > -while in "zdiff3" style, it may look like this: > > +while in the "zdiff3" style, it looks like this: > > The insertion of "the" surprises me. It reads better without it to > me, but I don't know if I'm just used to some grammar rule being > violated or something. Why is "the" necessary here? It's not necessary, but the addition of the word "the" suggests a single well-known term. If you say "minimalist style", that can refer to a broad range of styles that are generally refered to as of "minimalist" type. On the other hand if you say "the Minimalist tyle" it evokes a *single* style that cannot be confused with any other. In this case it's a single style, so "the" is warranted. -- Felipe Contreras