


If you open Repository Settings usually you find that no specific diff and merge tool is set. Settings pane contains a specific section for Git, where you can configure settings for the current repository or Global settings, valid for all repository of current user.įigure 2: Git settings inside Visual Studio If you use Visual Studio 2017 or greater, you can simply go to to Team Explorer and open settings of the repository.įigure 1: Git repository settings inside Visual Studio Team Explorer That post was written when Visual Studio 2012 was the latest version and the integration with Git was still really young, made with an external plugin made by Microsoft and with really basic support.

After almost six years, the post on How to configure diff and merge tool in Visual Studio Git Tools is still read by people that found it useful, but it is now really really old and needs to be updated.
