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

fix(*): using TextBlock instead of Label to avoid missing characters like '-', '_', etc.

Browse source
This commit is contained in:
leo 2020-09-01 17:22:47 +08:00
parent cfce4bddd7
commit 9b452bef8b
32 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/UI/Merge.xaml.cs
View file

@ -35,8 +35,8 @@ namespace SourceGit.UI {
InitializeComponent();
repo = opened;
sourceBranch.Content = source;
targetBranch.Content = dest;
sourceBranch.Text = source;
targetBranch.Text = dest;
combOptions.ItemsSource = new Option[] {
new Option("Default", "Fast-forward if possible", ""),
new Option("No Fast-forward", "Always create a merge commit", "--no-ff"),
@ -85,7 +85,7 @@ namespace SourceGit.UI {
var popup = repo.GetPopupManager();
popup?.Lock();
var branch = sourceBranch.Content as string;
var branch = sourceBranch.Text;
var opt = combOptions.SelectedItem as Option;
await Task.Run(() => repo.Merge(branch, opt.Arg));