Gregory Jefferis <jefferis@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html