From 224f7a949ae36f30151c57cf08ac502179800e7a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 20 May 2025 23:01:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20since=20`=E2=8C=A5`=20can=20not=20been?=
 =?UTF-8?q?=20used=20in=20`HotKey`=20property=20and=20`=E2=8C=98+=E2=8C=A5?=
 =?UTF-8?q?+D`=20has=20been=20used=20to=20show=20`Dock`,=20change=20the=20?=
 =?UTF-8?q?hotkey=20to=20open=20external=20merge=20tool=20to=20`Ctrl+Shift?=
 =?UTF-8?q?+D/=E2=8C=98+=E2=87=A7+D`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 6b324a6b..5bed2893 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+Alt+D, macOS=⌘+⌥+D}">
+                    HotKey="{OnPlatform Ctrl+Shift+D, macOS=⌘+Shift+D}">
               <ToolTip.Tip>
                 <TextBlock>
                   <Run Text="{DynamicResource Text.Diff.UseMerger}"/>
                   <Run Text=" "/>
-                  <Run Text="{OnPlatform Ctrl+Alt+D, macOS=⌘+⌥+D}" Foreground="{DynamicResource Brush.FG2}"/>
+                  <Run Text="{OnPlatform Ctrl+Shift+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 f628e29f..233c31a9 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+Alt+D, macOS=⌘+⌥+D}"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+D, macOS=⌘+⇧+D}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.OpenExternalMergeTool}" />
         </Grid>
       </StackPanel>