[Android] Use 3-way when applying patches

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep 28 14:30:02 2012 +0200| [9822e3be319ba7ab14684c757cd5af64d6217f26] | committer: Jean-Baptiste Kempf

Use 3-way when applying patches

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=9822e3be319ba7ab14684c757cd5af64d6217f26
---

 compile.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index ba68983..668698c 100755
--- a/compile.sh
+++ b/compile.sh
@@ -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"