[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Conflict-free merging (i.e. concat) of conflicting branches?
From:       "Richard Hartmann" <richih.mailinglist () gmail ! com>
Date:       2008-11-16 21:44:03
Message-ID: 2d460de70811161344n58cfb045n79b567493fef6a90 () mail ! gmail ! com
[Download RAW message or body]

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

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

Thanks.


Richard
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]