Does Visual Studio Have a Built in Merge Tool?

Question

I don't see a merge switch in Visual Studio's list of command line options: https://msdn.microsoft.com/en-us/library/xee0c8y7.aspx

I have used diff tool with the switch: \diff

I'm asking cause I want to use an in IDE tool as my merge tool with P4VS. I've figured out how to use Visual Studio's diff tool: Using the Built in Visual Studio Diff Tool to View P4VS's Diffs

I know there is a merge tool because Microsoft has to support Team Foundation Server: https://msdn.microsoft.com/en-us/library/ee341461(v=expression.40).aspx#sectionSection1 Is there any way I can get access to that merge tool?

Answer 1

You could directly use VsDiffMerge.exe tool to compare and merge local files. The tool directory is

C:\Program Files (X86)\Microsoft Visual Studio 1X.0)\Common\IDE\ VsDiffMerge.exe

To perform the merge action you need to use /m, details syntax is like this:

"%VS140COMNTOOLS%/../IDE/vsdiffmerge.exe" "File1" "File2" 
"FileThatServesAsBase" "FileThatServesasTarget" /m  

More detail info please take a look at this blog: Use Visual Studio as your Diff and Merging Tool for local files