Error configuring Visual Studio 2015 and TFS for BC4 integration

[Aaron]

Hello,

Did you configure the Merge following the steps outlined here?
http://www.scootersoftware.com/suppo...?zz=kb_vcs#tfs

It looks like your 'merge' might be configured as a 'compare'. Did you check the merge option to mark it as a mergetool? The above error is a Visual Studio error if you attempt to use %3 during a difftool definition.

[EJSawyer]

I've used BC for years with Visual Studio and TFS. I know all about the configuration command lines.

However, I recently installed VS2015 (Community Edition, if that matters). Configuring the compare worked fine, but when I configure the merge, I get the error:
"TF10098: Compare arguments cannot contain %3".

I've done a pretty thorough search of both the Scooter forums and the web, and can't find any info on this error.

Help!

Thanks,
Erik Sawyer