On Tue, Jan 06, 2009 at 09:44:06AM +0100, Thomas Rast wrote: > 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? I am, and yes. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
