From: Jeff King <peff@peff.net>
To: Thomas Rast <trast@student.ethz.ch>
Cc: jidanni@jidanni.org, git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] Documentation/merge-strategies.txt, diff-options: grammar
Date: Tue, 6 Jan 2009 04:38:42 -0500 [thread overview]
Message-ID: <20090106093842.GA10697@coredump.intra.peff.net> (raw)
In-Reply-To: <200901060944.09435.trast@student.ethz.ch>
On Tue, Jan 06, 2009 at 09:44:06AM +0100, Thomas Rast wrote:
> jidanni@jidanni.org wrote:
> > @@ -11,7 +11,7 @@ resolve::
> > recursive::
> > This can only resolve two heads using 3-way merge
> > algorithm. When there are more than one common
> > - ancestors that can be used for 3-way merge, it creates a
> > + ancestor that can be used for 3-way merge, it creates a
> > merged tree of the common ancestors and uses that as
> > the reference tree for the 3-way merge. This has been
> > reported to result in fewer merge conflicts without
>
> I'm not a native speaker, but shouldn't this be worded
>
> When there _is_ more than one common _ancestor_ that ...
>
> instead?
I am, and yes.
-Peff
prev parent reply other threads:[~2009-01-06 9:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-06 3:52 [PATCH] Documentation/merge-strategies.txt, diff-options: grammar jidanni
2009-01-06 8:44 ` Thomas Rast
2009-01-06 9:38 ` Jeff King [this message]
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090106093842.GA10697@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jidanni@jidanni.org \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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 NNTP newsgroup(s).