On Fri, Oct 17, 2008 at 00:48, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > Not sure, but in general blocking conflict markers by default would be a > bad idea IMHO, several markup language (asciidoc, for example) makes use > of the >>>, === and such character sequences. Doesn't git keep metadata about conflicts, as well? Richard -- 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
