[Git] Fix merge dialog sides for unstash and cherry-pick. Relates to IDEA-51187
[idea/community.git] / plugins / git4idea / src / git4idea / ui / GitUnstashDialog.java
index fe1313da38160d180562dae17ff53b0c17e17e0a..ba8d723cdcdc40fb6eec05e4873ae73635ccb768 100644 (file)
@@ -447,7 +447,7 @@ public class GitUnstashDialog extends DialogWrapper {
     private StashInfo myStashInfo;
 
     public UnstashConflictResolver(Project project, StashInfo stashInfo) {
     private StashInfo myStashInfo;
 
     public UnstashConflictResolver(Project project, StashInfo stashInfo) {
-      super(project, true, new UnstashMergeDialogCustomizer(stashInfo), "Unstashed with conflicts", "");
+      super(project, false, new UnstashMergeDialogCustomizer(stashInfo), "Unstashed with conflicts", "");
       myStashInfo = stashInfo;
     }
 
       myStashInfo = stashInfo;
     }