Allow to perform three way merges in git am

This commit is contained in:
Quentin Boyer 2024-12-10 16:23:51 +01:00
parent f817634959
commit c7f71cb9fb

View file

@ -432,7 +432,7 @@ impl FormatPatch {
})
.filter_map(|e| e.transpose())
.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()));
wt.exec(&apply_args)?;