Use three-way merge to apply exiv2 patch

This commit is contained in:
2023-02-05 11:20:22 +08:00
parent 68e2c7054b
commit 91d805589a

View File

@@ -10,7 +10,7 @@ IF NOT EXIST cbuild (
CD cbuild || EXIT /B 1
git clone --depth 1 "https://github.com/Exiv2/exiv2" || EXIT /B %ERRORLEVEL%
CD exiv2 || EXIT /B %ERRORLEVEL%
git apply %PATCH_DIR%\basicio.cpp.patch || EXIT /B %ERRORLEVEL%
git apply -3 %PATCH_DIR%\basicio.cpp.patch || EXIT /B %ERRORLEVEL%
IF NOT EXIST build (
MD build || EXIT /B 1
)