title: What are the command line arguments for TFS default merge tool for VS 2012?
body: <p>I am trying to add a merge tool in VS (<code>Tools -&gt; Options, Select Source Control -&gt; Visual Studio Team Foundation, Click Configure User Tools</code>), so that I can run the diff and merge correctly from the command line. The default tool works great from the VS editor, but not the command line, unless we add these settings.</p>
  
  <p>I have read a lot of good things about the new merge tool provided by VS 2012. The tool is located at:</p>
  
  <pre><code>C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\vsDiffMerge.exe
  </code></pre>
  
  <p>But I can't seem to get the command line arguments right.</p>