I\'m using WinMerge in Visual studio as a Merge Editor, by puting it in
Tools->Options->Source control->select Team Foundation -> Configu
