As a workaround, we wrote a special batch, which calls automatic merge before opening Code Compare. A disadvantage of using it will be the appearance of the console window. If you decide to use this solution, you should perform the following steps:
- Create a file with .bat extension with the following content:
Code: Select all
if not defined ProgramW6432 set ProgramW6432=%programfiles% "%programfiles%\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe" /merge /noprompt %1 %2 %3 %4 "%ProgramW6432%\Devart\Code Compare\CodeMerge.exe" /TF=%1 /MF=%2 /RF=%4 /BF=%3 /TT=%6 /MT=%7 /SC=TFS exit /B 0
- Open the merge tool settings in Visual Studio: Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Configure User Tools -> Add .*/Modify
- Specify the path to the batch file
- Specify the following arguments:
Code: Select all
%1 %2 %3 %4 %6 %7 %8 %9