feature: supports to customize merge message (--edit) (#1421)

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-17 15:07:55 +08:00
parent a8da8c09ac
commit 90310a704d
No known key found for this signature in database
6 changed files with 28 additions and 4 deletions

View file

@ -442,6 +442,7 @@
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Workspaces</x:String>
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Pages</x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
<x:String x:Key="Text.Merge.Edit" xml:space="preserve">Customize merge message</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
<x:String x:Key="Text.Merge.Source" xml:space="preserve">Source:</x:String>