git-diffall icon indicating copy to clipboard operation
git-diffall copied to clipboard

diff.tool or merge.tool should not be required when using --extcmd

Open revane opened this issue 12 years ago • 0 comments

diff.tool or merge.tool is only necessary if using git-mergetool--lib to execute a merge tool. If you're running an external command this information is not required. I suggest changing the logic to test for presence of diff.tool or merge.tool only once args are parsed and --extcmd is not present.

If diff.tool is not present you get an annoying message from get_merge_tool(). This could be avoided if we only call this function if --extcmd is not present.

revane avatar Feb 08 '13 16:02 revane