Visual Studio integration

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 2
Joined: Tue May 22, 2012 7:23 am
PostPosted: Tue May 22, 2012 7:36 am
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

Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Tue May 22, 2012 9:49 am
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?
Beth Kieler
SourceGear Technical Support

Posts: 2
Joined: Tue May 22, 2012 7:23 am
PostPosted: Tue May 22, 2012 10:10 am
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! :)

Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Tue May 22, 2012 12:58 pm
You're welcome.
Beth Kieler
SourceGear Technical Support

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 3 guests