How to configure 3 way merge feature on compare in Visual Studio 2015

Question

Problem: The default diff/ merge tool in visual studio 2015 (and previous versions) does not allow merging when you compare a file. It only allows you to see differences. The only occasion I'm aware of the 3 way merge option being enabled is when there is a merge conflict.

I want to see the 3 way merge option on every instance of the diff tool in Visual Studio.

Notes: I'm definitely not looking for an alternative tool or a 'work around' on this. I have been happily using WinMerge as my merge tool which allows merging anytime you compare. I really like the vs diff tool's 3 way option and being able to use it any time I want would be a nice boost to my work flow.

Thanks!

Answer 1

For anyone Googling Winmerge 3 way merging, Visual Studios settings for a merge are as follows: Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe Arguments: /e /u /wl /dl %7 /dm %8 /dr %6 %2 %3 %1 %4