It has been a long time coming, but Brian Harry has posted about how the next version of TFS will finally get a new merge/diff tool. Maybe the days of my most popular post are numbered.