three way merge

old-commit-hash: 702c4392a4
1 year ago · d5c951072b
parent 2526dcf30c
commit d5c951072b
1 changed files with 1 additions and 1 deletions
--- 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