Re: merging .gitignore
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:38
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