FrontEndJS/diff.xml at master · idaamit/FrontEndJS · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
<application>
  <component name="DiffManager">
    <enableFiles value="true" />
    <enableMerge value="true" />
    <filesTool value="C:\Program Files\Beyond Compare 4\BComp.exe" newValue="C:\Program Files\Beyond Compare 4\BComp.exe" />
    <mergeTool value="C:\Program Files\Beyond Compare 4\BComp.exe" newValue="C:\Program Files\Beyond Compare 4\BComp.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="C:\Program Files\Beyond Compare 4\BComp.exe" />
    <option name="DIFF_PARAMETERS" value="%1 %2 %3" />
    <option name="MERGE_ENABLED" value="true" />
    <option name="MERGE_EXE_PATH" value="C:\Program Files\Beyond Compare 4\BComp.exe" />
    <option name="MERGE_PARAMETERS" value="%1 %2 %3 %4" />
  </component>
</application>