File tree Expand file tree Collapse file tree 5 files changed +6
-0
lines changed Expand file tree Collapse file tree 5 files changed +6
-0
lines changed Original file line number Diff line number Diff line change @@ -125,6 +125,7 @@ public ContextMenu CreateChangeContextMenu()
125
125
var openWithMerger = new MenuItem ( ) ;
126
126
openWithMerger . Header = App . Text ( "OpenInExternalMergeTool" ) ;
127
127
openWithMerger . Icon = App . CreateMenuIcon ( "Icons.OpenWith" ) ;
128
+ openWithMerger . Tag = OperatingSystem . IsMacOS ( ) ? "⌘+⇧+D" : "Ctrl+Shift+D" ;
128
129
openWithMerger . Click += ( _ , ev ) =>
129
130
{
130
131
var toolType = Preferences . Instance . ExternalMergeToolType ;
Original file line number Diff line number Diff line change @@ -325,6 +325,7 @@ public ContextMenu CreateChangeContextMenu(Models.Change change)
325
325
var openWithMerger = new MenuItem ( ) ;
326
326
openWithMerger . Header = App . Text ( "OpenInExternalMergeTool" ) ;
327
327
openWithMerger . Icon = App . CreateMenuIcon ( "Icons.OpenWith" ) ;
328
+ openWithMerger . Tag = OperatingSystem . IsMacOS ( ) ? "⌘+⇧+D" : "Ctrl+Shift+D" ;
328
329
openWithMerger . Click += ( _ , ev ) =>
329
330
{
330
331
var toolType = Preferences . Instance . ExternalMergeToolType ;
Original file line number Diff line number Diff line change @@ -139,6 +139,7 @@ public ContextMenu CreateChangeContextMenu()
139
139
var openWithMerger = new MenuItem ( ) ;
140
140
openWithMerger . Header = App . Text ( "OpenInExternalMergeTool" ) ;
141
141
openWithMerger . Icon = App . CreateMenuIcon ( "Icons.OpenWith" ) ;
142
+ openWithMerger . Tag = OperatingSystem . IsMacOS ( ) ? "⌘+⇧+D" : "Ctrl+Shift+D" ;
142
143
openWithMerger . Click += ( _ , ev ) =>
143
144
{
144
145
var opt = new Models . DiffOption ( GetSHA ( _startPoint ) , GetSHA ( _endPoint ) , change ) ;
Original file line number Diff line number Diff line change @@ -226,6 +226,7 @@ public ContextMenu MakeContextMenuForChange()
226
226
var openWithMerger = new MenuItem ( ) ;
227
227
openWithMerger . Header = App . Text ( "OpenInExternalMergeTool" ) ;
228
228
openWithMerger . Icon = App . CreateMenuIcon ( "Icons.OpenWith" ) ;
229
+ openWithMerger . Tag = OperatingSystem . IsMacOS ( ) ? "⌘+⇧+D" : "Ctrl+Shift+D" ;
229
230
openWithMerger . Click += ( _ , ev ) =>
230
231
{
231
232
var toolType = Preferences . Instance . ExternalMergeToolType ;
Original file line number Diff line number Diff line change @@ -587,6 +587,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges(string selectedSingleFold
587
587
var openMerger = new MenuItem ( ) ;
588
588
openMerger . Header = App . Text ( "OpenInExternalMergeTool" ) ;
589
589
openMerger . Icon = App . CreateMenuIcon ( "Icons.OpenWith" ) ;
590
+ openMerger . Tag = OperatingSystem . IsMacOS ( ) ? "⌘+⇧+D" : "Ctrl+Shift+D" ;
590
591
openMerger . Click += async ( _ , e ) =>
591
592
{
592
593
if ( change . IsConflicted )
@@ -1275,6 +1276,7 @@ public ContextMenu CreateContextMenuForStagedChanges(string selectedSingleFolder
1275
1276
var openWithMerger = new MenuItem ( ) ;
1276
1277
openWithMerger . Header = App . Text ( "OpenInExternalMergeTool" ) ;
1277
1278
openWithMerger . Icon = App . CreateMenuIcon ( "Icons.OpenWith" ) ;
1279
+ openWithMerger . Tag = OperatingSystem . IsMacOS ( ) ? "⌘+⇧+D" : "Ctrl+Shift+D" ;
1278
1280
openWithMerger . Click += ( _ , ev ) =>
1279
1281
{
1280
1282
var toolType = Preferences . Instance . ExternalMergeToolType ;
You can’t perform that action at this time.
0 commit comments