Skip to content
Merged

Fix ci #2447

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
282 changes: 270 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion asyncgit/src/sync/branch/merge_ff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub fn branch_merge_upstream_fastforward(
}

#[cfg(test)]
pub mod test {
mod test {
use super::*;
use crate::sync::{
remotes::{fetch, push::push_branch},
Expand Down
1 change: 0 additions & 1 deletion asyncgit/src/sync/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ pub fn untracked_files_config(
}

/// get string from config

pub fn get_config_string(
repo_path: &RepoPath,
key: &str,
Expand Down
Loading
Loading