From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Mon, 26 Mar 2012 19:06:30 GMT
Subject: Re: Merge-friendly text-based data storage
Message-ID: <CAD77+gQVDtoK0vJnSgX-+i9EeJo6QErUGuzd25_cfBmUfPvW4g@mail.gmail.com>
In-Reply-To: <7vfwcvp6pi.fsf@alter.siamese.dyndns.org>

On Mon, Mar 26, 2012 at 20:17, Junio C Hamano <gitster@pobox.com> wrote:

> It may be of interest to run "git help attributes" and read up on
> "Defining a custom merge driver" section.

Sounds good, thanks.

My file layout looks fine?


-- 
Richard