1. molafish

    Great reference. I was just going through doing this myself with tortoisemerge (figuring out what to plug in from the command line options) in VS2010 when I thought that someone else probably has already documented it and found this page.

    One thing to note is that the TFS client built into VS (at least in 2010 RC) waits for the merge tool to close before you can accept the results from the merged window. So you can’t keep the tortoisemerge window open, which I often did with svn. Just something to keep in mind because it initially threw me…

Leave a Reply

Your email address will not be published.