Re: merging .gitignore

From: Johan Herland <johan@herland.net>
Date: Oct 3, 2007, 13:06 UTC
Message-ID: <200710031506.23938.johan@herland.net>
In-Reply-To: <Pine.LNX.4.64.0710031314530.28395@racer.site>

On Wednesday 03 October 2007, Johannes Schindelin wrote:

Show 7 quoted lines

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

I suspected so... ;)

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net