From 1db5e23f95afada809ae411ed41f19df54647e9e Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 2 Feb 2012 20:19:21 +0400 Subject: [PATCH] Show merge commit content correctly on "Show All Affected Paths" invoked from File History --- .../src/git4idea/actions/GitShowAllSubmittedFilesAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java index ceb6ddaee938..a97f569e70b8 100644 --- a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java @@ -102,7 +102,7 @@ public class GitShowAllSubmittedFilesAction extends AnAction implements DumbAwar indicator.setIndeterminate(true); try { VirtualFile vcsRoot = GitUtil.getGitRoot(file); - final CommittedChangeList changeList = GitChangeUtils.getRevisionChanges(project, vcsRoot, revision, false); + final CommittedChangeList changeList = GitChangeUtils.getRevisionChanges(project, vcsRoot, revision, true); if (changeList != null) { UIUtil.invokeLaterIfNeeded(new Runnable() { public void run() {