apply-from-gmane: fall back to three-way merges
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 20:40:02 +0000 (12 15:40 -0500)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 12 Jun 2013 20:40:02 +0000 (12 15:40 -0500)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
bin/apply-from-gmane.sh

index 0b337f2..998574a 100755 (executable)
@@ -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