Visual Studio integration

[abellix]

Hi, I'm trying to set DiffMerge as the merge tool used by TFS.
I tried to apply the following arguments (i get them from the DiffMerge manual)

Code: Select all

/m /r=%4 /t1=%7 /t2=%8 /t3=%6 /c=%9 %2 %3 %1

Unfortunately when I submit I get this error:

TF10098: Compare arguments cannot contain %3

Any tip? Thank you

[Beth]

Did you enter your configuration in just the merge configuration, or is that in the diff configuration? That configuration you posted is specific only to merging.

Is the file you are selecting to perform the merge on currently present on your hard drive?

[abellix]

Beth,

you're right, I just had to check the second option of the combo box (Compare/Merge)...

me silly. It works perfectly now.

Thank you for your help!

[Beth]

You're welcome.