Archive
Archive for the ‘TFS’ Category
How to ignore whitespace formatting in merge conflicts in TFS in Visual Studio 2010.
August 8, 2012
Leave a comment
Hate when you see all Blue because someone reformatted the code?
Fix it.
In Visual Studio, select Tools / Options / Source Control / Visual Studio Team Foundation System and click the Configure User Tools button.
In the dialog, Add an item with the following settings.
- Extension : .*
- Operation : Compare
- Command : C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe
- Arguments : %1 %2 %6 %7 %5 /ignorespace
If you are 64 bit,
C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe
Categories: TFS
Comments