vs里用beyongcompare进行合并和比较

1.tools -> options -> source control -> visual studio team foundation server -> “configure user tools” button
2.Add:
Extension: .*
Operation: Compare
Compare: C:\Program Files\Beyond Compare 3\BComp.exe
Arguments: %1 %2 /title1=%6 /title2=%7

3.Add:
Extension: .*
Operation: Merge
Compare: C:\Program Files\Beyond Compare 3\BComp.exe
Arguments: %1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9

关于中文乱码
工具->文件格式－c,c++->转换->编码->ANSI