From 10e89d8a3c2b0c908dab491408afad9d10228198 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 12 May 2011 12:24:55 +0400 Subject: [PATCH] [Git] Fix merge dialog sides for unstash and cherry-pick. Relates to IDEA-51187 --- .../src/git4idea/history/browser/LowLevelAccessImpl.java | 5 ++--- plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java b/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java index 6afd6c8e654b..8d0ef322c0db 100644 --- a/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java +++ b/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java @@ -32,7 +32,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.util.AsynchConsumer; import git4idea.GitBranch; -import git4idea.GitRevisionNumber; import git4idea.GitTag; import git4idea.GitVcs; import git4idea.commands.GitCommand; @@ -232,7 +231,7 @@ public class LowLevelAccessImpl implements LowLevelAccess { private String myCommitMessage; public CherryPickConflictResolver(Project project, String commitHash, String commitAuthor, String commitMessage) { - super(project, true, new CherryPickMergeDialogCustomizer(commitHash, commitAuthor, commitMessage), "Cherry-picked with conflicts", ""); + super(project, false, new CherryPickMergeDialogCustomizer(commitHash, commitAuthor, commitMessage), "Cherry-picked with conflicts", ""); myCommitHash = commitHash; myCommitAuthor = commitAuthor; myCommitMessage = commitMessage; @@ -281,7 +280,7 @@ public class LowLevelAccessImpl implements LowLevelAccess { @Override public String getRightPanelTitle(VirtualFile file, VcsRevisionNumber lastRevisionNumber) { - return "Changes from cherry-pick " + ((GitRevisionNumber)lastRevisionNumber).toShortString() + ""; + return "Changes from cherry-pick " + myCommitHash + ""; } } diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java index fe1313da3816..ba8d723cdcdc 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java @@ -447,7 +447,7 @@ public class GitUnstashDialog extends DialogWrapper { 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; } -- 2.32.0