Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Launch external merge tool from console

Gabriel Ramos September 24, 2014

Hi, I would like to know how can use the "Launch external merge tool" functionality but from the console.

If you could provide me a code sample, I'd really appreciate it.

 

Thanks in advance!

1 answer

0 votes
Stefan Saasen
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
September 25, 2014

HI Gabriel,

 

You can use the http://git-scm.com/docs/git-mergetool command to invoke an external merge tool. Here is one example how to set up Vim as an external mergetool: http://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/ and I'm assuming that you can find other examples for the merge tool of your choice.

Cheers,

Stefan

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events