3 ms·The merge tool (p4merge) is a dream, I shoehorn it into any VCS I use including TFS.by skeletonjelly 14y agoThe merge tool (p4merge) is a dream, I shoehorn it into any VCS I use including TFS.