three way merge

This commit is contained in:
Adeeb Shihadeh
2023-12-10 12:10:40 -08:00
committed by GitHub
parent 3831bf19e4
commit 702c4392a4

View File

@@ -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