How can I see the list of available merge tools for git on the command line?

Question

I am using git on a virtual machine Ubuntu server running command-line only and I don't know vim (and frankly I don't really want to learn it right now) so I don't want to use vimdiff. How can I get the list of available merge tools for git?

Bonus points for a list of merge tools usable from the command line that don't have too much of a steep learning curve!

http://programmers.stackexchange.com/questions/147681/command-line-merge-conflict-tools — qqx, Aug 19 '13 at 20:58
@devnull: you're right, I have updated my question accordingly. — Technoh, Aug 19 '13 at 21:06

score 32 · Answer 1 · answered Jul 31 '14 at 17:18

32

This gives you the list without actually starting the merge :

git mergetool --tool-help

answered Jul 31 '14 at 17:18

Trunal Bhanse

1,651
1
17
27

score 2 · Accepted Answer · answered Aug 19 '13 at 20:04

2

Just run it without a tool value:

$ git mergetool --tool=
merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse ecmerge p4merge araxis bc3 vimdiff emerge

I'll leave the bonus points for the documentation :/

answered Aug 19 '13 at 20:04

sehe

374,641
47
450
633

Running this command also starts the merge. Is there no way to see the available list without merging? Not that it's a big bother. – Technoh Aug 19 '13 at 21:00
`git help config` and search for mergetool - the same list is in the manual page. That won't start the merge... – twalberg Jul 31 '14 at 19:08

How can I see the list of available merge tools for git on the command line?

2 Answers2