From 19da2d04c2883bf9b21944489fca14e1fa839b99 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Sun, 3 Dec 2017 23:14:18 +0300 Subject: [PATCH] Fix cancel handling in svn merge "local changes intersection" prompt EA-95374 --- .../integrate/QuickMergeInteractionImpl.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java index 4439bf293837..1e134fff4a3a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.idea.svn.integrate; import com.intellij.openapi.project.Project; @@ -107,7 +93,7 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction { } int result = showDialog(message, myTitle, map2Array(possibleResults, String.class, TO_STRING()), 0, getQuestionIcon()); - return possibleResults[result]; + return result == -1 ? cancel : possibleResults[result]; } @Override