Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

2
  • @DopeGhoti's answer solves my issue but I also found this useful stackoverflow.com/questions/7309707/… Commented Feb 2, 2017 at 17:52
  • 1
    'git config --global merge.tool' shows the currently set merge tool Commented Feb 2, 2017 at 18:32