kiedysktos kiedysktos - 1 month ago 7
Git Question

How do I check which merge tool I use?

I want to check which merge tool my git is set to - I just don't remember the name. I know I can wait till the next merge opportunity to run it via

git merge tool
and see what was it, but I'd like to type something like
git mergetool status
to see what is the tool (and what is the version, for instance).

Answer

to see what git resolves as the difftool, over the different config files:

git config --get merge.tool

If the result is not a builtin, then to see how it is configured:

git config --get mergetool.THE_MERGE_TOOL

see git help config