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 - 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