[git] Again IDEA-66115: default fo line separator conversion is ASK.

This commit is contained in:
Kirill Likhodedov
2012-07-03 17:31:32 +04:00
parent e26dc93745
commit 60d0111307
@@ -69,7 +69,7 @@ public class GitVcsSettings implements PersistentStateComponent<GitVcsSettings.S
public SshExecutable SSH_EXECUTABLE = SshExecutable.IDEA_SSH;
public UpdateChangesPolicy UPDATE_CHANGES_POLICY = UpdateChangesPolicy.STASH; // The policy that specifies how files are saved before update or rebase
public UpdateMethod UPDATE_TYPE = UpdateMethod.BRANCH_DEFAULT;
public ConversionPolicy LINE_SEPARATORS_CONVERSION = ConversionPolicy.CONVERT;
public ConversionPolicy LINE_SEPARATORS_CONVERSION = ConversionPolicy.ASK;
public boolean PUSH_AUTO_UPDATE = false;
public GitBranchSyncSetting SYNC_SETTING = GitBranchSyncSetting.NOT_DECIDED;
public String RECENT_GIT_ROOT_PATH = null;