From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Sun, 16 Nov 2008 21:44:03 GMT
Subject: Re: Conflict-free merging (i.e. concat) of conflicting branches?
Message-ID: <2d460de70811161344n58cfb045n79b567493fef6a90@mail.gmail.com>
In-Reply-To: <7viqqn4ouo.fsf@gitster.siamese.dyndns.org>

On Sun, Nov 16, 2008 at 17:28, Junio C Hamano <gitster@pobox.com> wrote:

> gitattributes(5) and look for "union"?

Thanks.


Richard