From c60a2de324e2148a39ec84178e1f2419d680a4e2 Mon Sep 17 00:00:00 2001
From: Sina Hinderks <sina@hinderks.net>
Date: Fri, 11 Jul 2025 08:15:00 +0200
Subject: [PATCH] ux: add hotkey for OPEN EXTERNAL MERGETOOL button (#1558)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When opening the context menu for a conflicted file in the unstaged
view, the displayed hotkey (Ctrl+Shift+D/⌘+⇧+D, added in #1547) for
opening the merge tool is working now.
---
 src/Views/Conflict.axaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index 7e4003ed..ffceac75 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -125,7 +125,11 @@
               <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>
             </StackPanel>
           </Button>
-          <Button Classes="flat" Margin="8,0,0,0" Command="{Binding OpenExternalMergeTool}" IsVisible="{Binding CanUseExternalMergeTool}">
+          <Button Classes="flat"
+                  Margin="8,0,0,0"
+                  Command="{Binding OpenExternalMergeTool}"
+                  IsVisible="{Binding CanUseExternalMergeTool}"
+                  HotKey="{OnPlatform Ctrl+Shift+D, macOS=⌘+Shift+D}">
             <StackPanel Orientation="Horizontal">
               <Path Width="12" Height="12" Data="{StaticResource Icons.OpenWith}"/>
               <TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" VerticalAlignment="Center"/>