These are compare arguments for TFS comparer. Tools > options > source Control > VS TFS. It will ignore white space in comparison/merge window.
Here are the values for the fields to copy paste
Extension - .*
C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\diffmerge.exe
Compare Args -
%1 %2 %6 %7 %5 /ignorespace
Merge Args -
%1 %2 %3 %4 %6 %7 %8 %9 /ignorespace /merge
For Visual Studiio 2008 use "C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\diffmerge.exe"
Looks as you have to add /merge as option for the merge setting. If not you will get a compare while merging.....
ReplyDeleteYes that is why I've specified different arguments for Merge and Compare.
ReplyDelete