From 4ac1f881c48ae6ba2f68f27814d2e50c87525b02 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 12 Oct 2016 19:29:54 +0300 Subject: [PATCH] svn: Do not check all revisions for "manual select" quick merge by default --- .../src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java index 82d05a1aad43..41e02388f07c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java @@ -117,7 +117,7 @@ public class ToBeMergedDialog extends DialogWrapper { myListsEngine = new BasePageEngine<>(lists, lists.size()); myPanel = new JPanel(new BorderLayout()); - myWiseSelection = new QuantitySelection<>(myAllListsLoaded); + myWiseSelection = new QuantitySelection<>(allStatusesCalculated); myAlreadyMerged = newHashSet(); setOKButtonText("Merge Selected"); initUI();