From 6fa454ace8b60debe001c45d86f145f74f8368fe Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 20 May 2025 17:32:06 +0800
Subject: [PATCH] fix!: same hotkey for opening external diff tool and discard
 block (#1337)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/DiffView.axaml | 4 ++--
 src/Views/Hotkeys.axaml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index b6d1fd65..6b324a6b 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -178,12 +178,12 @@
             <Button Classes="icon_button"
                     Width="28"
                     Command="{Binding OpenExternalMergeTool}"
-                    HotKey="{OnPlatform Ctrl+D, macOS=⌘+D}">
+                    HotKey="{OnPlatform Ctrl+Alt+D, macOS=⌘+⌥+D}">
               <ToolTip.Tip>
                 <TextBlock>
                   <Run Text="{DynamicResource Text.Diff.UseMerger}"/>
                   <Run Text=" "/>
-                  <Run Text="{OnPlatform Ctrl+D, macOS=⌘+D}" Foreground="{DynamicResource Brush.FG2}"/>
+                  <Run Text="{OnPlatform Ctrl+Alt+D, macOS=⌘+⌥+D}" Foreground="{DynamicResource Brush.FG2}"/>
                 </TextBlock>
               </ToolTip.Tip>
               <Path Width="12" Height="12" Stretch="Uniform" Data="{StaticResource Icons.OpenWith}"/>
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 5275f264..f628e29f 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -149,7 +149,7 @@
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="primary bold" Text="ESC"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+D, macOS=⌘+D}"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Alt+D, macOS=⌘+⌥+D}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.OpenExternalMergeTool}" />
         </Grid>
       </StackPanel>