File | Settings | Version Control | CVS
Use this page to specify the version control settings to be applied to the directories of your project that are under CVS control.
In this area, define the IntelliJ IDEA behavior when merge conflicts occur during update from the server.
|Use read-only flag for not edited file||Select this check box to have the read-only status assigned to a file automatically after the check out, update, or commit operations.|
|Show CVS server output||Select this check box to have the server output of CVS commands displayed in the CVS Output tool window.|
|Default keyword substitution for text files||
Use this drop-down list to specify the keyword expansion mode. CVS uses the keyword substitution mode of a file to differentiate binary files
from ASCII files and to indicate what type of keyword substitution is applied when files are committed and checked out.
The available options are:
|Global Settings||Click this button to open the Global CVS Settings dialog box.|