Skip to content

Commit c60a2de

Browse files
authored
ux: add hotkey for OPEN EXTERNAL MERGETOOL button (#1558)
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.
1 parent b1efd65 commit c60a2de

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/Views/Conflict.axaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,11 @@
125125
<TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.UseMine}" VerticalAlignment="Center"/>
126126
</StackPanel>
127127
</Button>
128-
<Button Classes="flat" Margin="8,0,0,0" Command="{Binding OpenExternalMergeTool}" IsVisible="{Binding CanUseExternalMergeTool}">
128+
<Button Classes="flat"
129+
Margin="8,0,0,0"
130+
Command="{Binding OpenExternalMergeTool}"
131+
IsVisible="{Binding CanUseExternalMergeTool}"
132+
HotKey="{OnPlatform Ctrl+Shift+D, macOS=⌘+Shift+D}">
129133
<StackPanel Orientation="Horizontal">
130134
<Path Width="12" Height="12" Data="{StaticResource Icons.OpenWith}"/>
131135
<TextBlock Margin="6,0,0,0" Text="{DynamicResource Text.WorkingCopy.Conflicts.OpenExternalMergeTool}" VerticalAlignment="Center"/>

0 commit comments

Comments
 (0)