totoise svn和kdiff的配置

来源:互联网 发布:美国 博士后 知乎 编辑:程序博客网 时间:2024/06/16 02:33
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

enter image description here

shareimprove this answer
0 0