Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <>
To: Elijah Newren <>,
	Adam Johnson via GitGitGadget <>
Cc:, Junio C Hamano <>,
	Adam Johnson <>
Subject: Re: [PATCH] doc: merge: improve conflict presentation docs
Date: Sun, 07 May 2023 16:25:37 -0600	[thread overview]
Message-ID: <645825614027d_4e612949f@chronos.notmuch> (raw)
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

  reply	other threads:[~2023-05-07 22:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05 13:58 [PATCH] doc: merge: improve conflict presentation docs Adam Johnson via GitGitGadget
2023-05-05 22:35 ` Junio C Hamano
2023-05-07 22:15   ` Felipe Contreras
2023-05-06 23:40 ` Elijah Newren
2023-05-07 22:25   ` Felipe Contreras [this message]
2023-05-08 15:25   ` Elijah Newren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=645825614027d_4e612949f@chronos.notmuch \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).