Re: merging .gitignore

Johan Herland [off-list ref] writes:

On Wednesday 03 October 2007, Johannes Schindelin wrote:

quoted

On Wed, 3 Oct 2007, Johan Herland wrote:

quoted

- 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"...

I suspected so... ;)

Yeah, and that is one of the reasons why we made gitignore and
gitattributes one-entry-per-line format.