Re: merging .gitignore

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 3, 2007, 19:38 UTC
Message-ID: <7vejgcdm3z.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200710031506.23938.johan@herland.net>

Johan Herland <johan@herland.net> writes:

Show 10 quoted lines

> On Wednesday 03 October 2007, Johannes Schindelin wrote:
>> 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... ;)

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