Re: [PATCH v4 3/6] mergetool: use get_merge_tool function

On Thu, Apr 25, 2019 at 02:54:39AM -0700, Denton Liu wrote: > In git-mergetool, the logic for getting which merge tool to use is > duplicated in git-mergetool--lib, except for the fact that it needs to > know whether the tool was guessed or not. > > Rewrite `get_merge_tool` to return whether or no

[PATCH v4 3/6] mergetool: use get_merge_tool function

In git-mergetool, the logic for getting which merge tool to use is duplicated in git-mergetool--lib, except for the fact that it needs to know whether the tool was guessed or not. Rewrite `get_merge_tool` to return whether or not the tool was guessed through the return code and make git-mergetool