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


i using git on virtual machine ubuntu server running command-line , don't know vim (and frankly don't want learn right now) don't want use vimdiff. how can list of available merge tools git?

bonus points list of merge tools usable command line don't have of steep learning curve!

just run without 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 bonus points documentation :/


Comments

Popular posts from this blog

Detect support for Shoutcast ICY MP3 without navigator.userAgent in Firefox? -

web - SVG not rendering properly in Firefox -

java - JavaFX 2 slider labelFormatter not being used -