From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Mar 2012 18:17:45 GMT
Subject: Re: Merge-friendly text-based data storage
Message-ID: <7vfwcvp6pi.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAD77+gRTv4Aq_4FLAQcD9E0p7VBD7h6hQq3CJ9Wo5DU9Zjt+Hg@mail.gmail.com>

Richard Hartmann <richih.mailinglist@gmail.com> writes:

> As long as there are no lines that start with the same file name, this
> file format would allow for efficient merging _if_ git has an internal
> concept of line identifiers.

You can write a custom low-level merge driver, and use the attribute
system to mark that your file is meant to be handled by that ll-merge
driver.  There is no need for Git to have "an internal concept of line
identifiers".

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