githubteacher / github-for-developers-sept-2015

practice repo for the Sept 29-30 GitHub for Developers class
12 stars 36 forks source link

Can you use external UI based merge tools for resolving merge #690

Closed Gurinder-Gill closed 8 years ago

jaw6 commented 8 years ago

You can. This can be invoked with git mergetool and configured with git config --global merge.tool.