Hi,
I configured BC as the diff tool for Team Foundation as described in the KB article.
I also configured it as the merge tool, but each time I close it, I get an error message saying "The manual merge for <file name> has been canceled".
Any ideas?
Thank You,
Shay
I configured BC as the diff tool for Team Foundation as described in the KB article.
I also configured it as the merge tool, but each time I close it, I get an error message saying "The manual merge for <file name> has been canceled".
Any ideas?
Thank You,
Shay
Comment