From b20a9425fa6da7f1f43622bf3cffab58d46935ee Mon Sep 17 00:00:00 2001
From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Thu, 6 Jul 2017 16:37:27 +0300
Subject: [PATCH] IDEA-90088 Change order of buttons in the Line Separator
 Warning Dialog

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

diff --git a/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java b/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java
index 89e7121c7416..1bc1f57badab 100644
--- a/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java
+++ b/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java
@@ -61,7 +61,7 @@ public class GitCrlfDialog extends DialogWrapper {
   @NotNull
   @Override
   protected Action[] createActions() {
-    return new Action[] { getHelpAction(), getOKAction(), getCancelAction(), new DialogWrapperExitAction("Commit As Is", DONT_SET) };
+    return new Action[] { getHelpAction(), getOKAction(), new DialogWrapperExitAction("Commit As Is", DONT_SET), getCancelAction() };
   }
 
   @Override