From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 03 Oct 2007 12:41:23 GMT
Subject: Re: merging .gitignore
Message-ID: <Pine.LNX.4.64.0710031314530.28395@racer.site>
In-Reply-To: <200710031128.56472.johan@herland.net>

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