Skip to content

Commit 670cee4

Browse files
authored
Try git-am instead of git-apply in generate_templates.sh
1 parent f1366f8 commit 670cee4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/generate_templates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cd $(dirname $0)/../cpython/Doc/locales
2222
# Useful if setup.sh was not ran
2323
if [ ${PYDOC_VERSION} = '3.7' ] && [ ! -f ../../114553.patch ]; then
2424
curl -L https://github.com/python/cpython/pull/114553.patch -o ../../114553.patch
25-
git apply ../../114553.patch
25+
git am ../../114553.patch
2626
fi
2727

2828
# Generate message catalog template (.pot) files

0 commit comments

Comments
 (0)