diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs index 914d1e0c8..708761f0a 100644 --- a/src/ViewModels/BranchCompare.cs +++ b/src/ViewModels/BranchCompare.cs @@ -125,6 +125,7 @@ public ContextMenu CreateChangeContextMenu() var openWithMerger = new MenuItem(); openWithMerger.Header = App.Text("OpenInExternalMergeTool"); openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D"; openWithMerger.Click += (_, ev) => { var toolType = Preferences.Instance.ExternalMergeToolType; diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs index 790c656cc..085f0aab0 100644 --- a/src/ViewModels/CommitDetail.cs +++ b/src/ViewModels/CommitDetail.cs @@ -325,6 +325,7 @@ public ContextMenu CreateChangeContextMenu(Models.Change change) var openWithMerger = new MenuItem(); openWithMerger.Header = App.Text("OpenInExternalMergeTool"); openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D"; openWithMerger.Click += (_, ev) => { var toolType = Preferences.Instance.ExternalMergeToolType; diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs index 6de99d888..a7bb03d3a 100644 --- a/src/ViewModels/RevisionCompare.cs +++ b/src/ViewModels/RevisionCompare.cs @@ -139,6 +139,7 @@ public ContextMenu CreateChangeContextMenu() var openWithMerger = new MenuItem(); openWithMerger.Header = App.Text("OpenInExternalMergeTool"); openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D"; openWithMerger.Click += (_, ev) => { var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change); diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs index 9fbb5582d..2ebe63542 100644 --- a/src/ViewModels/StashesPage.cs +++ b/src/ViewModels/StashesPage.cs @@ -226,6 +226,7 @@ public ContextMenu MakeContextMenuForChange() var openWithMerger = new MenuItem(); openWithMerger.Header = App.Text("OpenInExternalMergeTool"); openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D"; openWithMerger.Click += (_, ev) => { var toolType = Preferences.Instance.ExternalMergeToolType; diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index 493ec9272..ccac01a72 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -587,6 +587,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges(string selectedSingleFold var openMerger = new MenuItem(); openMerger.Header = App.Text("OpenInExternalMergeTool"); openMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + openMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D"; openMerger.Click += async (_, e) => { if (change.IsConflicted) @@ -1275,6 +1276,7 @@ public ContextMenu CreateContextMenuForStagedChanges(string selectedSingleFolder var openWithMerger = new MenuItem(); openWithMerger.Header = App.Text("OpenInExternalMergeTool"); openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D"; openWithMerger.Click += (_, ev) => { var toolType = Preferences.Instance.ExternalMergeToolType;