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

feature<Merge>: show progress for merge

Browse source
This commit is contained in:
leo 2021-05-26 18:58:34 +08:00
parent 67f5eed9a0
commit 763779b529
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Views/Popups/Merge.xaml.cs
View file

@ -26,7 +26,7 @@ namespace SourceGit.Views.Popups {
var mode = (cmbMode.SelectedItem as Models.MergeOption).Arg;
return Task.Run(() => {
Models.Watcher.SetEnabled(repo, false);
new Commands.Merge(repo, source, mode).Exec();
new Commands.Merge(repo, source, mode, UpdateProgress).Exec();
Models.Watcher.SetEnabled(repo, true);
return true;
});