TortoiseSVN + Araxis&WinMerge Setting

TortoiseSVN : v.1.7.7 - 64 bit

Araxis : v.2011.4074

WinMerge : v.2.12.4.0

 

General - Subversion - Global ignore pattern (1)

__history *.~* *.dcu *.local *.identcache *.drc *.map *.zip *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store thumbs.db Thumbs.db *.bak *.class *.ap_ *.exe *.dll *.mine *.obj *.ncb *.lib *.log *.idb *.pdb *.ilk *.msi* *.pch *.suo *.exp *.*~ *.~* ~*.* release Release debug Debug ignore Ignore obj Obj *.csproj.user *.user *.dbs *.d ipch *.sdf *.opensdf  bin Bin *.asv

General - Subversion - Global ignore pattern (2) 

__history *.~* *.dcu *.local *.identcache *.drc *.map *.zip *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store thumbs.db Thumbs.db *.bak *.class *.ap_ *.exe *.mine *.obj *.ncb *.log *.idb *.pdb *.ilk *.msi* *.pch *.suo *.exp *.*~ *.~* ~*.* release Release debug Debug ignore Ignore obj Obj *.csproj.user *.dbs *.d ipch *.sdf *.opensdf  bin Bin *.asv

Setting - External Programs - Diff Viewer

"C:\Program Files (x86)\Araxis\Araxis Merge\compare.exe" /max /wait /title1:%bname /title2:%yname %base %mine

"C:\Program Files (x86)\Araxis\Araxis Merge\compare.exe" /max /wait /title1:%bname /title2:%yname %base %mine

-or-

"C:\Program Files (x86)\WinMerge\WinMergeU.exe"  %base %mine /dl %bname /dr %yname

"C:\Program Files (x86)\WinMerge\WinMergeU.exe"  %base %mine /dl %bname /dr %yname

 

Setting - External Programs - Merge Tool

"C:\Program Files (x86)\Araxis\Araxis Merge\compare.exe" /a2 /max /wait /3 /title1:%tname /title2:%bname /title3:%yname %theirs %base %mine %merged

 

Setting - External Programs - Unified Diff Viewer

C:\Program Files (x86)\Araxis\Araxis Merge\Merge.exe