ux: hotkey tag on external merger menu items #1547
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
Yep, I found that tooltip whilst implementing this PR. I guess I look at context menus more often than I hover over buttons. |
sina-hide
added a commit
to sina-hide/sourcegit
that referenced
this pull request
Jul 11, 2025
When opening the context menu for a conflicted file in the unstaged view, the displayed hotkey (Ctrl+Shift+D/⌘+⇧+D, added in sourcegit-scm#1547) for opening the merge tool is working now.
sina-hide
added a commit
to sina-hide/sourcegit
that referenced
this pull request
Jul 11, 2025
When opening the context menu for a conflicted file in the unstaged view, the displayed hotkey (Ctrl+Shift+D/⌘+⇧+D, added in sourcegit-scm#1547) for opening the merge tool is working now.
love-linger
pushed a commit
that referenced
this pull request
Jul 11, 2025
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I didn't realize there was a hotkey for launching the external merger. Added menu item tags to make this discoverable.