The question I asked was How do I configure WinMerge as the compare and merge tool for TFS, which I answered myself. However, I did not mark it as the accepted answer in case someone else provided a better answer.
TehOne answered the question with a link to an article that shows you how to configure TFS to work with many merge tools. I'd like to mark that as the accept answer and change my question to "How do I configure TFS to work with various merge tools?" Would this be considered acceptable?