Using a different diff/merge tool when solving template conflicts

  • 18 February 2019
  • 0 replies

Userlevel 5
Badge +6
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.

0 replies

Be the first to reply!