From d3447ca2cb461d4aa5ed5729b366c7b73d37821a Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 21 Apr 2015 15:11:28 +0300
Subject: [PATCH] diff: remove duplicated actions from keymap

these shortcuts did nothing anyway, because ChangesViewManages assighned CommonShortcuts.getDiff() instead
---
 platform/platform-resources/src/idea/PlatformActions.xml | 2 +-
 platform/platform-resources/src/idea/VcsActions.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index a5588feda2f4..a1e91a27c9a8 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -158,7 +158,7 @@
     <group id="VcsGeneral.KeymapGroup"/> <!-- grouping for Settings -> Keymap -> Version Control Systems -->
 
     <group id="Diff.KeymapGroup" text="Diff">
-      <action id="CompareTwoFiles" class="com.intellij.diff.actions.CompareFilesAction"/>
+      <action id="CompareTwoFiles" class="com.intellij.diff.actions.CompareFilesAction" icon="AllIcons.Actions.Diff"/>
       <action id="CompareFileWithEditor" class="com.intellij.diff.actions.CompareFileWithEditorAction"/>
       <action id="CompareClipboardWithSelection" class="com.intellij.diff.actions.CompareClipboardWithSelectionAction"/>
 
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 03156a36546d..69a817f324a4 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -88,7 +88,7 @@
       <action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"
               icon="AllIcons.Actions.MoveToAnotherChangelist"/>
       <action id="ChangesView.Diff" class="com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction"
-              icon="AllIcons.Actions.Diff"/>
+              icon="AllIcons.Actions.Diff" use-shortcut-of="CompareTwoFiles"/>
     </group>
 
     <group id="AlienCommitChangesDialog.AdditionalActions"/>
@@ -137,7 +137,7 @@
               text="Unshelve..." description="Correct paths where to apply patches and unshelve"/>
       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
       <action id="ShelvedChanges.Diff" class="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"
-          icon="AllIcons.Actions.Diff"/>
+          icon="AllIcons.Actions.Diff" use-shortcut-of="CompareTwoFiles"/>
       <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction"
               icon="AllIcons.Actions.CreatePatch"/>
       <action id="ShelvedChanges.ImportPatches" class="com.intellij.openapi.vcs.changes.shelf.ImportIntoShelfAction"/>