From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Sun, 27 Feb 2011 11:15:50 GMT
Subject: Re: Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)
Message-ID: <AANLkTinByZS0yQ6TNTwp74kW3yvTg8G_PQN3F99MKR2w@mail.gmail.com>
In-Reply-To: <AANLkTimWPwCFgnAYz_jJ3Yw5QWvPNhPxq=j502UorEot@mail.gmail.com>

On Sun, Feb 27, 2011 at 11:57, Sebastian Schuberth <sschuberth@gmail.com> wrote:

>> with your suggestion. We should probably make use of the -title options
>> to remove ambiguity.
>
> Good idea, I'll look into this.

Given that the -title options actually replace the display of the file
name (instead of displaying the title in addition), I'd prefer not to
make use of these options. In fact, the file names Git uses for
merging already contain "BASE", "LOCAL", "REMOTE", so there should be
no real need for additional titles, IMHO.

I'll push out the updated series now.

-- 
Sebastian Schuberth