Re: [PATCH] mergetool--lib: Allow custom commands to override built-ins

2012-09-26 Thread David Aguilar
On Wed, Sep 26, 2012 at 7:06 AM, Junio C Hamano wrote: > Ramkumar Ramachandra writes: > >> Hi David, >> >> David Aguilar wrote: >>> diff_cmd () { >>> - merge_tool_cmd="$(get_merge_tool_cmd "$1")" >>> - if test -z "$merge_tool_cmd" >>> - then >>> - status=1 >>> -

Re: [PATCH] mergetool--lib: Allow custom commands to override built-ins

2012-09-26 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Hi David, > > David Aguilar wrote: >> diff_cmd () { >> - merge_tool_cmd="$(get_merge_tool_cmd "$1")" >> - if test -z "$merge_tool_cmd" >> - then >> - status=1 >> - break >> - fi >> - ( eval $merge_tool_cmd )

[PATCH] mergetool--lib: Allow custom commands to override built-ins

2012-09-25 Thread David Aguilar
Allow users to override the default commands provided by the mergetools/* scriptlets. Users occasionally run into problems where they expect to be able to override the built-in tool names. The documentation does not explicitly mention that built-ins cannot be overridden, so it's easy to assume th