From: Karl Hasselström <kha@treskal.com>
Date: Tue, 02 Dec 2008 08:37:26 GMT
Subject: Re: A better approach to diffing and merging
Message-ID: <20081202083726.GA17563@diana.vm.bytemark.co.uk>
In-Reply-To: <m3y6z0i0mu.fsf@localhost.localdomain>

On 2008-12-01 03:41:38 -0800, Jakub Narebski wrote:

> Third, it would require embedding knowledge about various programming
> languages (including C, shell, Perl, TeX) and document formats
> (including XML, HTML, AsciiDoc) in version control system...

Really? I was under the impression that you could specify external
diff and merge programs in .gitattributes, which would be precisely
the right way to hook this stuff into git.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle