From: martin f krafft <madduck@madduck.net>
Date: Tue, 02 Oct 2007 20:20:23 GMT
Subject: Re: merging .gitignore
Message-ID: <20071002202023.GA16010@lapse.madduck.net>
In-Reply-To: <7vodfhjnpe.fsf@gitster.siamese.dyndns.org>

also sprach Junio C Hamano <gitster@pobox.com> [2007.10.02.2055 +0100]:
> Perhaps you can use the existing union merge there.

Many thanks for the pointer, I did not even have time to look at
gitattributes.txt yet...

-- 
martin;              (greetings from the heart of the sun.)
  \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck
 
"self-denial is the shining sore
 on the leprous body of christianity."
                                                        -- oscar wilde
 
spamtraps: madduck.bogus@madduck.net