Replace visual studio 2012 Diff tool with winmerge when using Microsoft Git Provider

I have a Visual Studio 2012 v3 and git extensions installed.

I want to change the default merge tool to winmerge but it seems that this is not a trivial task when Microsoft Git Provider is chosen.

  • Git archive of repository with uncommitted changes
  • Eclipse Egit will not import repo in workspace
  • Crucible compared to Gerrit?
  • how to correctly setup credential-osxkeychain for git
  • Which SCM can comfortably handle 90,000 files
  • GIT Fatal : refusing to merge unrelated histories
  • When i go to VS -> Tools -> Options -> Source Control I have only Plug-in-Selection tab and cannot choose configure tools to change to WinMerge.


    Is there any way of using Git Extensions with WinMerge inside VS2012?

  • Error on deploying with Git on Heroku
  • How to clone previous repo version to local machine?
  • How to git a folder outside the repository?
  • Chef: How to add changes made via dashboard to Git?
  • Automate Release Notes - Jenkins and Github
  • As Ember 2.* uses Git when creating a new project, how do I create my own Git repo for my web app's development?
  • One Solution collect form web for “Replace visual studio 2012 Diff tool with winmerge when using Microsoft Git Provider”

    Backed up by that DZone-article, the trick is to configure the diff-tool in git.config:

    1. Open the git bash in your repository
    2. Create a config section for WinMerge as a diff-tool:

      $ git config --local difftool.winmerge.cmd '"C:\Program Files (x86)\WinMerge\WinMergeU.exe" "$LOCAL" "$REMOTE"'
    3. Configure git to switch to WinMerge as the diff-tool:

      $ git config --local diff.tool winmerge

    If you want to have this setting as a global setting, replace the --local switch with --global.

    Git Baby is a git and github fan, let's start git clone.