Commit 6f2d20f
committed
ux: add hotkey for OPEN EXTERNAL MERGETOOL button
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.1 parent 75279fb commit 6f2d20f
1 file changed
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
128 | | - | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
129 | 133 | | |
130 | 134 | | |
131 | 135 | | |
| |||
0 commit comments