Skip to content

Commit ecffe01

Browse files
authored
Merge branch 'master' into try-insta
2 parents a478e2e + 640bf33 commit ecffe01

File tree

23 files changed

+430
-164
lines changed

23 files changed

+430
-164
lines changed

Cargo.lock

Lines changed: 270 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asyncgit/src/sync/branch/merge_ff.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub fn branch_merge_upstream_fastforward(
5050
}
5151

5252
#[cfg(test)]
53-
pub mod test {
53+
mod test {
5454
use super::*;
5555
use crate::sync::{
5656
remotes::{fetch, push::push_branch},

asyncgit/src/sync/config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ pub fn untracked_files_config(
7171
}
7272

7373
/// get string from config
74-
7574
pub fn get_config_string(
7675
repo_path: &RepoPath,
7776
key: &str,

0 commit comments

Comments
 (0)