traxys/git-series-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to perform three way merges in git am

Browse source
This commit is contained in:
Quentin Boyer 2024-12-10 16:23:51 +01:00
parent f817634959
commit c7f71cb9fb
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -432,7 +432,7 @@ impl FormatPatch {
}) })
.filter_map(|e| e.transpose()) .filter_map(|e| e.transpose())
.collect::<Result<Vec<_>>>()?; .collect::<Result<Vec<_>>>()?;
let mut apply_args = vec!["am"]; let mut apply_args = vec!["am", "-3"];
apply_args.extend(patches.iter().map(|s| s.deref())); apply_args.extend(patches.iter().map(|s| s.deref()));
wt.exec(&apply_args)?; wt.exec(&apply_args)?;