StarTeam has a built in "Visual Diff" and "Visual Merge" tool we use all the time (on top of using ST for our CVS).. if you want these tools you can download StarTeam at
www.starbase.com and get an evaluation key..
On the other hand, i'm sure there are hundreds of other similar tools that do the same job (maybe even better).