apply-from-gmane: fall back to three-way merges

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

bin/apply-from-gmane.sh

@@ -22,4 +22,4 @@ case "$URL" in
 *) URL=${URL%/}/raw;;
 esac
 
-curl $URL | git am --whitespace=fix -s
+curl $URL | git am --whitespace=fix -3 -s