dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-05 02:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feature: add context menu for changes in Views.CommitDetail and Views.RevisionCompare to diff with external merge tool (#53)

Browse source
This commit is contained in:
leo 2024-04-07 20:02:43 +08:00
parent b5b1f0cb8d
commit 24b6e39066
5 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Resources/Locales/en_US.axaml
View file

@ -137,8 +137,9 @@
<x:String x:Key="Text.Diff.Prev" xml:space="preserve">Previous Difference</x:String>
<x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Side-By-Side Diff</x:String>
<x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Syntax Highlighting</x:String>
<x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Open With Merge Tool</x:String>
<x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Open In Merge Tool</x:String>
<x:String x:Key="Text.Diff.Welcome" xml:space="preserve">SELECT FILE TO VIEW CHANGES</x:String>
<x:String x:Key="Text.DiffWithMerger" xml:space="preserve">Open In Merge Tool</x:String>
<x:String x:Key="Text.Discard" xml:space="preserve">Discard Changes</x:String>
<x:String x:Key="Text.Discard.All" xml:space="preserve">All local changes in working copy.</x:String>
<x:String x:Key="Text.Discard.Changes" xml:space="preserve">Changes :</x:String>