Commit 9822e3be authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Use 3-way when applying patches

parent 7da77518
......@@ -95,7 +95,7 @@ if [ ! -d "vlc" ]; then
cd vlc
git checkout -B android ${TESTED_HASH}
echo "Applying the patches"
git am ../patches/*.patch
git am -3 ../patches/*.patch
if [ $? -ne 0 ]; then
git am --abort
echo "Applying the patches failed, aborting git-am"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment