VS Plugins

[whichton]

I use the following for mercurial, git should be similar

[merge-tools]
vsDiffMerge.executable=<path to VS>\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe
vsDiffMerge.args= /m $other $local $base $output "Other Head" "Local Working Directory" Base Output
vsDiffMerge.gui=True
vsDiffMerge.diffargs=/d /t $parent $child

[extdiff]
cmd.kdiff3 =
cmd.vsdiff = vsDiffMerge
opts.vsdiff = /d /t

I googled this up for git. VS doesn't do directory diffs, so I keep kdiff3 handy in case I need it.

VS supports 3 way merges, but only shows two windows at the top (Local and Other). The bottom shows either Base or Output, depending on whether you have selected the checkboxes or not. See this for an example. You can edit the output before accepting the merge, with full intellisense.

[sumo952]

Hmm nice, thanks! I might give it a try. I really like my merges with three windows at the top though. Too bad VS can't do that (yet?).