Launch external merge tool from console

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

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
Community showcase
Posted Friday in Off-topic

Friday Fun: Dry T-Shirt Competition - What's your BEST (Atlassian) T-Shirt!?

[Note: So it was my turn for Friday Fun and sadly I was sick thanks to rubbish sinus infection... so apologies to most of Europe and Asia for the delayed post. However, I finally got out of bed for t...

166 views 9 4
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you