views:

13

answers:

1

I would like to have team explorer use BeyondCompare or SourceGear's diffmerge in order to do my conflict resolution in team explorer. I know its possible, but where is the setting for that and what is the syntax for it?

+1  A: 

Hi

this looks like it would answer your question http://stackoverflow.com/questions/1313908/how-do-i-configure-tfs-to-work-with-various-merge-tools

CrapHands