From 702c4392a448eff18eb64537fdf46e0741558b8b Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sun, 10 Dec 2023 12:10:40 -0800
Subject: [PATCH] three way merge

---
 scripts/apply-pr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/apply-pr.sh b/scripts/apply-pr.sh
index 65805b8485..74f765391a 100755
--- a/scripts/apply-pr.sh
+++ b/scripts/apply-pr.sh
@@ -8,4 +8,4 @@ fi
 BASE="https://github.com/commaai/openpilot/pull/"
 PR_NUM="$(echo $1 | grep -o -E '[0-9]+')"
 
-curl -L $BASE/$PR_NUM.patch | git apply
+curl -L $BASE/$PR_NUM.patch | git apply -3