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.

  • Is there any way to undo the effects of “git revert head”?
  • GIT <> SVN interchangeable patch-files
  • /mingw32/libexec/git-core/git-sh-setup: 30: Syntax error: word unexpected (expecting “)”)
  • Can't update project to a specific branch
  • Merging XML file changes in git
  • Pip install from a specific commit prompts “requirements already satisfied”
  • 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?

  • Git merge after fetch - how, exactly?
  • RTC to Git Migration using rtc2git -
  • With Git, is it possible to re-apply an ancestor revision?
  • How do I push changes to a git repo with conflicting history?
  • Laravel Homestead Installation: bash not working
  • gitpython: Command syntax for git commit
  • 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.