How to configure Visual Studio Code as your GIT merge tool
28 June 2017I'm a big fan of Visual Studio Code. It's fast, extensible and it even runs cross platform. Recently it has gotten build in support for merging. Before, I was using Diffmerge as my merge tool of choice, but I find the 3-way merge view with the remote, base and local files a bit confusing. Visual Studio Code just shows one file and shows the differences inline
