Skip to content

Commit c781b07

Browse files
authored
Remove 3way git flag in patch-pytorch.sh script (#4959)
Signed-off-by: Ettore Tiotto <[email protected]>
1 parent 01d1b36 commit c781b07

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/patch-pytorch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ apply_patch() {
2525
echo "Applying patch $1"
2626
cd "$REPO_ROOT"
2727
if [[ -f $SCRIPTS_DIR/$1 ]]; then
28-
git apply --3way "$SCRIPTS_DIR/$1"
28+
git apply "$SCRIPTS_DIR/$1"
2929
else
3030
fetch_patch "$1"
31-
git apply --3way "$SCRIPTS_DIR/$(basename "$1")"
31+
git apply "$SCRIPTS_DIR/$(basename "$1")"
3232
fi
3333
}
3434

0 commit comments

Comments
 (0)