dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-01 09:24:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feature<DiffViewer>: supports to diff with external merge tools

Browse source
This commit is contained in:
leo 2021-05-31 10:25:48 +08:00
parent 8993f50944
commit 259473626b
6 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Resources/Locales/en_US.xaml
View file

@ -228,6 +228,7 @@
<sys:String x:Key="Text.Diff.Next">Next Difference</sys:String>
<sys:String x:Key="Text.Diff.Prev">Previous Difference</sys:String>
<sys:String x:Key="Text.Diff.Mode">Toggle One-Side/Two-Sides</sys:String>
<sys:String x:Key="Text.Diff.UseMerger">Open With Merge Tool</sys:String>
<sys:String x:Key="Text.Diff.Welcome">SELECT FILE TO VIEW CHANGES</sys:String>
<sys:String x:Key="Text.Diff.NoChange">NO CHANGES OR ONLY EOL CHANGES</sys:String>
<sys:String x:Key="Text.Diff.Binary">BINARY DIFF</sys:String>

1
src/Resources/Locales/zh_CN.xaml
View file

@ -228,6 +228,7 @@
<sys:String x:Key="Text.Diff.Next">下一个差异</sys:String>
<sys:String x:Key="Text.Diff.Prev">上一个差异</sys:String>
<sys:String x:Key="Text.Diff.Mode">切换显示模式</sys:String>
<sys:String x:Key="Text.Diff.UseMerger">使用外部合并工具查看</sys:String>
<sys:String x:Key="Text.Diff.Welcome">请选择需要对比的文件</sys:String>
<sys:String x:Key="Text.Diff.NoChange">没有变更或仅有换行符差异</sys:String>
<sys:String x:Key="Text.Diff.Binary">二进制文件</sys:String>