jidanni@xxxxxxxxxxx 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:
signature.asc
Description: This is a digitally signed message part.
