Is it possible to use the diff tool in visual studio 2012 together with git?
Using “devenv /diff fileA fileB” i can bring up a diff between two files, but
how can i add a third (base file) as well, having 3 views side by side.
Im currently using TortoiseGit and BeyondCompare.
Git can be configured to use any generic diff tool, not only the one it knows out of the box. To call a generic diff tool, set the
diff.toolconfiguration variable to a custom diff tool alias, say “vs2012”, by typinggit config --global diff.tool vs2012and create a correspondingcmdvariable for that diff tool alias by typinggit config --global difftool.vs2012.cmd <path_to_devenv> -diff "$LOCAL" "$REMOTE". Note that I’m using a dash instead of a slash for the “diff” option to work around MSYS path mangling issues, and luckily devenv also accepts dashes for command line options. Now you should be able to call the VS2012 diff tool by typinggit difftool.For merging, I guess I have to disappoint you,
devenv /diffonly accepts exactly two files.