The Diff preferences panel is opened from menu and it allows you to set the compare options for SVN client.
The SVN diff preferences are the following:
- Show pseudo conflicts - It allows you to specify if you want to see pseudo-conflicts in the Compare view. A pseudo conflict occurs when two developers make the same change, for example when both add or remove the same line of code.
- Compare With External Application - You can specify an external
application to be launched for compare operations in the following cases:
- when two history revisions are compared
- when the working copy file is compared with a history revision
- when a conflict is edited
The parameters ${firstFile} and ${secondFile} specify the positions of the two compared files in the command line for the external diff application. The parameter ${ancestorFile} specifies the common ancestor (that is, the BASE revision of a file) in a three-way comparison: the working copy version of a file is compared with the repository version, with the BASE revision (the latest revision read from the repository by an Update or Synchronize operation) being the common ancestor of these two compared versions.
- Maximum number of differences - You can change the maximum number of differences allowed in the view.
