When a template code conflict occurs during a merge session it's possible to merge the code via an external diff/merge tool. TSF requires the existence of the diff/merge tools WinMerge or Kdiff3.
We actually use UltraCompare as the default diff/merge tool when comparing code.
It would be nice if we could configure the default diff/merge tool for the TSF.
Using a different diff/merge tool when solving template conflicts
Windows GUI
Enter your username or e-mail address. We'll send you an e-mail with instructions to reset your password.
Unfortunately, this idea has not received enough votes. Because we want to keep the focus on ideas that are in high demand in our Community, we have closed this idea.