Search found 2 matches

by abellix
Tue May 22, 2012 10:10 am
Forum: Support (DiffMerge)
Topic: Visual Studio integration
Replies: 3
Views: 10381

Re: Visual Studio integration

Beth,

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

me silly. It works perfectly now.

Thank you for your help! :)
by abellix
Tue May 22, 2012 7:36 am
Forum: Support (DiffMerge)
Topic: Visual Studio integration
Replies: 3
Views: 10381

Visual Studio integration

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) /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