totoise svn和kdiff的配置

C:\Program Files (x86)\KDiff3\kdiff3.exe %base %theirs %mine -o %merged --L1 %bname --L2 %tname --L3 %yname 
http://4byte.cn/question/2103654/saving-merges-using-kdiff3-with-tortoisesvn.html 
配置使用utf8 merge配置

  
  
  
  

In Kdiff3

Main menu: Settings - Configure Kdiff3 - Regional settings tab

Select "Unicode, 8 bit" in case of UTF8 without BOM or enable "Auto detect Unicode" in case of UTF8-BOM

totoise svn和kdiff的配置_第1张图片

share improve this answer

你可能感兴趣的:(totoise svn和kdiff的配置)