mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2025-01-04 15:53:30 +03:00
cargo fmt
This commit is contained in:
parent
52757a4ad5
commit
687d73897a
@ -1284,7 +1284,13 @@ mod upstream {
|
||||
|
||||
{
|
||||
// merge branch upstream
|
||||
let branch = controller.list_virtual_branches(&project_id).await.unwrap().into_iter().find(|b| b.id == branch1_id).unwrap();
|
||||
let branch = controller
|
||||
.list_virtual_branches(&project_id)
|
||||
.await
|
||||
.unwrap()
|
||||
.into_iter()
|
||||
.find(|b| b.id == branch1_id)
|
||||
.unwrap();
|
||||
repository.merge(&branch.upstream.as_ref().unwrap().name);
|
||||
repository.fetch()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user