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.
[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...
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!
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