From 8bd1fdf351e6a1a0508038b9dc0f4bb2bbeafc45 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Date: Fri, 1 Aug 2014 18:41:37 +0400
Subject: [PATCH] diff: fix keymap collision

---
 platform/platform-resources/src/idea/Keymap_EclipseMac.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/platform-resources/src/idea/Keymap_EclipseMac.xml b/platform/platform-resources/src/idea/Keymap_EclipseMac.xml
index dc1dcb5e66ec..f35e24c776b0 100644
--- a/platform/platform-resources/src/idea/Keymap_EclipseMac.xml
+++ b/platform/platform-resources/src/idea/Keymap_EclipseMac.xml
@@ -312,6 +312,10 @@
       <keyboard-shortcut first-keystroke="meta 3"/>
     </action>
 
+    <action id="Vcs.RollbackChangedLines">
+      <keyboard-shortcut first-keystroke="control shift alt Z"/>
+    </action>
+
     <action id="ActivateProjectToolWindow"/>
     <action id="ActivateFavoritesToolWindow"/>
     <action id="ActivateFindToolWindow">