visualstudio 比较和merge工具命令行配置

Compare tools

Product	Command	Arguments
TFS default	diffmerge.exe	%1 %2 %6 %7 %5 /ignorespace
WinDiff	windiff.exe	%1 %2
DiffDoc (for Word files)	DiffDoc.exe	/M%1 /S%2
WinMerge	winmerge.exe	/ub /dl %6 /dr %7 %1 %2
Beyond Compare	bc2.exe	%1 %2 /title1=%6 /title2=%7
KDiff3	kdiff3.exe	%1 --fname %6 %2 --fname %7
Araxis	compare.exe	/wait /2 /title1:%6 /title2:%7 %1 %2
Compare It!	Wincmp3.exe	%1 /=%6 %2 /=%7
SourceGear DiffMerge	DiffMerge.exe	/title1=%6 /title2=%7 %1 %2
Beyond Compare 3	BCompare.exe	%1 %2 /title1=%6 /title2=%7
TortoiseMerge	TortoiseMerge.exe	/base:%1 /mine:%2 /basename:%6 /minename:%7
Visual SlickEdit	win/vsdiff.exe	%1 %2

Merge tools

Product	Command	Arguments
TFS default	diffmerge.exe	/merge %1 %2 %3 %4 %6 %7
KDiff3	kdiff3.exe	%3 --fname %8 %2 --fname %7 %1 --fname %6 -o %4
Visual SourceSafe	ssexp.exe	/merge %1 %2 %3 %4 %6 %7
Araxis	compare.exe	/wait /swap /a3 /3 /title1:%6 /title2:%7 /title3:%8 %1 %2 %3 %4
Beyond Compare (2-way merge)	bc2.exe	%1 %2 /savetarget=%4 /title1=%6 /title2=%7
WinMerge (2-way merge)	winmerge.exe	/ub /dl %6 /dr %7 %1 %2 %4
Guiffy	guiffy.exe	-s -h1%6 -h2%7 -hm%9 %1 %2 %3 %4
Ellie Computing	guimerge.exe	--mode=merge3 %3 %1 %2 --to=%4 --title0=%8 --title1=%6 --title2=%7 --to-title=%9
SourceGear DiffMerge	DiffMerge.exe	/title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2
Beyond Compare 3	BCompare.exe	%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
TortoiseMerge	TortoiseMerge.exe	/base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9
Visual SlickEdit	win/vsmerge.exe	%3 %1 %2 %4

转载于:https://www.cnblogs.com/marryZhan/archive/2010/06/23/2213950.html