From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Fri, 26 Jun 2009 13:51:21 GMT
Subject: Re: Choosing a mergetool according to file type
Message-ID: <vpq7hyzqf1i.fsf@bauges.imag.fr>
In-Reply-To: <C66A8B6B.20617%jefferis@gmail.com>

Gregory Jefferis <jefferis@gmail.com> writes:

> This defines the merge driver but not the mergetool.  A mergetool is
> presumably an interactive tool that helps you clean up failed automatic
> merges.

This is why I quoted the title of the section

>>        Defining a custom merge driver

Just tried it with 

[merge "filfre"]
       name = feel-free merge driver
       driver = gedit %O %A %B
       recursive = binary

It did launch gedit interactively during the merge.

-- 
Matthieu