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

2019-04-24 Thread Junio C Hamano
Denton Liu writes: > This change is not completely backwards compatible as there may be > external users of git-mergetool--lib. However, only one user, > git-diffall[1], was found from searching GitHub and Google. It seems > very unlikely that there exists an external caller that would take into

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

2019-04-24 Thread Denton Liu
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