-
Notifications
You must be signed in to change notification settings - Fork 0
/
diff.xml
25 lines (25 loc) · 1.08 KB
/
diff.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
<application>
<component name="DiffManager">
<enableFiles value="true" />
<enableMerge value="true" />
<filesTool value="D:\Program Files\Beyond Compare\BCompare.exe" newValue="D:\Program Files\Beyond Compare\BCompare.exe" />
<mergeTool value="D:\Program Files\Beyond Compare\BCompare.exe" newValue="D:\Program Files\Beyond Compare\BCompare.exe" />
<mergeToolParameters value="%1 %2 %3 %4" />
</component>
<component name="ExternalDiffSettings">
<option name="DIFF_ENABLED" value="true" />
<option name="DIFF_DEFAULT" value="true" />
<option name="DIFF_EXE_PATH" value="D:\Program Files\Beyond Compare\BCompare.exe" />
<option name="DIFF_PARAMETERS" value="%1 %2 %3" />
<option name="MERGE_ENABLED" value="true" />
<option name="MERGE_EXE_PATH" value="D:\Program Files\Beyond Compare\BCompare.exe" />
<option name="MERGE_PARAMETERS" value="%1 %2 %3 %4" />
</component>
<component name="SvnDiffSettings">
<option name="PLACES_MAP">
<entry key="Default">
<PlaceSettings />
</entry>
</option>
</component>
</application>