From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Oct 2007 19:55:41 GMT
Subject: Re: merging .gitignore
Message-ID: <7vodfhjnpe.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20071002195148.GA14171@lapse.madduck.net>

martin f krafft <madduck@madduck.net> writes:

> Basically I am saying that it should be
>
>   cat $gitignore_files | sort -u
>
> and obviously, this is something for a specific merge driver, as
> Johannes suggested.

Perhaps you can use the existing union merge there.