From d3418fc1e11042295de1162b233d9fd5feb4f3e5 Mon Sep 17 00:00:00 2001 From: irengrig Date: Sun, 4 Dec 2011 16:23:01 +0400 Subject: [PATCH] IDEA-66552 (usability): modal windows for diff/merge: show diff from shelf - in frame, similar to show diff from changes | local --- .../openapi/vcs/changes/shelf/DiffShelvedChangesAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java index c4b37c443f04..b9a1702e25d0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java @@ -141,7 +141,7 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware { VcsBalloonProblemNotifier.showOverChangesView(project, "Show Diff: Cannot find base for: " + StringUtil.join(missing, ",\n"), MessageType.WARNING); } - ShowDiffAction.showDiffImpl(project, diffRequestPresentables, toSelectIdx, new ShowDiffUIContext(false)); + ShowDiffAction.showDiffImpl(project, diffRequestPresentables, toSelectIdx, new ShowDiffUIContext(true)); } private static class PatchesPreloader {