From: Jakub Narebski <hidden> Date: 2016-08-11 20:18:13
Sam Vilain wrote:
For those who like to spawn interactive merge tools on a merge failure
or otherwise run some kind of script, allow a "merge.tool" repo-config
option that will take arguments as merge(1) does.
How it goes together with merge-recursive rewrite using built-in merge tool
from xdiff, xdl_merge?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git