From 60d01113079f9dc4de3db1be0e87fa475762160e Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 3 Jul 2012 14:18:13 +0400
Subject: [PATCH] [git] Again IDEA-66115: default fo line separator conversion
 is ASK.

---
 plugins/git4idea/src/git4idea/config/GitVcsSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java
index 3dfbca3a803f..2a0df2f5481e 100644
--- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java
+++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java
@@ -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;