How do I check which merge tool I use?

git mergetool
kiedysktos picture kiedysktos · Oct 12, 2016 · Viewed 9.3k times · Source

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

Gregg picture Gregg · Oct 12, 2016

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

Related questions

Git: How configure KDiff3 as merge tool and diff tool

Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of Git and KDiff3. When I make a merge and …

Read More
How can I make WinMerge my git mergetool?

I'm trying to integrate WinMerge with Git as I've seen others done before on Windows 7 Ultimate. I've followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff. Created a …

Read More
How do I use vimdiff to resolve a git merge conflict?

I just merged a branch into my master in git and I got Automatic merge failed; fix conflicts and then commit the result. Now I ran git mergetool and vimdiff opened with the image below. I don't know how to …

Read More