Using Visual Studio 2015 as Diff and Merge Tool with Git