Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>This is a workaround that seems to get around the problem.</p> <p>In Visual Studio, select Tools / Options / Source Control / Visual Studio Team Foundation System and click the Configure User Tools button.</p> <p>In the dialog, Add an item with the following settings.</p> <ul> <li>Extension : .* </li> <li>Operation : Compare </li> <li>Command : C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe</li> <li>Arguments : %1 %2 %6 %7 %5 /ignorespace</li> </ul> <hr /> <h3>Edit:</h3> <p>Depending on your <strong>Visual Studio version</strong> and <strong>instalation path</strong> (x64/x86), the command option may be...</p> <p><strong>VS2010:</strong> C:\Program Files <em>(x86)</em>\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe<br> <strong>VS2012:</strong> C:\Program Files <em>(x86)</em>\Microsoft Visual Studio 11.0\Common7\IDE\diffmerge.exe<br> <strong>VS2013:</strong> C:\Program Files <em>(x86)</em>\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe<br> <strong>VS2015:</strong> C:\Program Files <em>(x86)</em>\Microsoft Visual Studio 14.0\Common7\IDE\vsDiffMerge.exe<br> <strong>VS2017:</strong> C:\Program Files <em>(x86)</em>\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe</p> <p>In the argument option leave it with the same number of arguments as the VS suggests and just add /ignorespace in the end. For example, in the VS2015 it will be: </p> <pre><code>%1 %2 /ignorespace </code></pre>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload