Kiln, WebStorm配置Compare Tool

1. Kiln配置Compare Tool

在C:/User/{UserName}中找到Mercurial.ini文件，打开添加：

<span style="font-family:Times New Roman;font-size:14px;">%include Mercurial-kiln.ini%    //在这句话下面添加以下语句[extensions]eol=hgext.extdiff=[extdiff]cmd.bc4diff = C:\Program Files (x86)\Beyond Compare 4\BCompare.exe</span></span>

其中，

<span style="font-family:Times New Roman;font-size:14px;">cmd.bc4diff = C:\Program Files (x86)\Beyond Compare 4\BCompare.exe</span>

是根据自己而定的，cmd.bc4diff也可以为cmd.compare之类的字符串，等号后面的路径是自己Compare Tool的文件路径。

2. WebStorm配置Compare Tool

File -> Settings -> Tools -> Diff -> External Diff Tools，勾选Use external diff tool， 勾选User by default， 在Path to executable中填写Compare Tool路径。

Merge Tool类似。