Hi, On Wed, 3 Oct 2007, Johan Herland wrote: > - Teach the .gitignore parser to ignore conflict markers (i.e. regard them > as comments) You might be delighted to know that in practice, it works already (because you usually do not have a file named "<<<<<< blablub" or "======" or ">>>>>> blablub"... Ciao, Dscho - 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
