The configuration window of external applications is used to specify which applications of the plug-in should be loaded for different operations.

SVN executable
• GUI executable
  Allows customization of the application, which will be performed by the command "Start Source control" from IDE.

Use following tools for
• Diff/merge
  The application is loaded when the command to compare is performed. It is possible to configure format of command line arguments using keywords %first(%1), %second(%2) and %ancesto(%3). When calling compare tools such keywords will be replaced to quoted names of real files. It is possible to configure command line separately for 2-way and 3-way compare tools.
  Also you can use extended keywords %file_name (it will be replaced on only file name without location path), %first_rev, %second_rev and %ancestor_rev. They might be used for editor's headings, when supported. (For instance - Araxis Merge 6.5 is supporting that).
• Conflict resolving
  The application is loaded for conflict resolving. Similar to diff/merge tool it is possible to configure format of command line arguments. Keyword %merged represent the file itself; %theirs represent the repository version of file; %base is the common predecessor; %mine is your version of file. This is the maximum number of versions which possible to provide for conflict resolving tools. But the %merged and %theirs versions are most important, %base and %mine is just helpers.
  Option to restore conflict markers enables conflict markers in %merged file when conflict resolution tool is launched. Markers are created on the fly before launching conflict tool and are removed after it closed. This is to support different kind of tools. For example the build-in CVS conflict editor tool can accept only one argument "%merged" if it contains conflict markers or "%merged %theirs" when there are no conflict markers.
  Also you can use extended keywords %file_name (it will be replaced on only file name without location path), %base_rev, %theirs_rev. They might be used for editor's headings, when supported. (For instance - Araxis Merge 6.5 is supporting that).
• Viewing
  The application is loaded for file viewing.

Allow non modal view and compare windows
When this option is switched on, plug-in does not wait for closing view/compare tool. This allows to open several compare/view windows what might be helpful. But the side effect of this is a temporary files which remain on local disk in temporary folder.

---

Tweet