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!
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 :/