Re: merging .gitignore
From: Johan Herland <hidden>
Date: 2016-06-15 22:43:38
On Wednesday 03 October 2007, Johannes Schindelin wrote:
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... ;) ...Johan -- Johan Herland, [off-list ref] www.herland.net