github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-24 02:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

ux: add hotkey for OPEN EXTERNAL MERGETOOL button (#1558)

Browse Source 
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.
This commit is contained in:
Sina Hinderks
2025-07-11 08:15:00 +02:00
committed by GitHub
parent b1efd6527c
commit c60a2de324
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Views/Conflict.axaml
View File

@@ -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"/>