From c7f71cb9fb34af08d36d21bca7dcdae9a91dcf69 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin.boyer@eviden.com>
Date: Tue, 10 Dec 2024 16:23:51 +0100
Subject: [PATCH] Allow to perform three way merges in git am

---
 src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index 8983258..693dc0c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -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)?;