From: Thomas Rast <trast@student.ethz.ch>
To: jidanni@jidanni.org
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] Documentation/merge-strategies.txt, diff-options: grammar
Date: Tue, 6 Jan 2009 09:44:06 +0100 [thread overview]
Message-ID: <200901060944.09435.trast@student.ethz.ch> (raw)
In-Reply-To: <1231213956-14929-1-git-send-email-jidanni@jidanni.org>
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
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?
--
Thomas Rast
trast@{inf,student}.ethz.ch
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-01-06 8:45 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 [this message]
2009-01-06 9:38 ` Jeff King
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=200901060944.09435.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jidanni@jidanni.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.