From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 12 Jun 2013 20:40:02 +0000 (-0500)
Subject: apply-from-gmane: fall back to three-way merges
X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/a98fbeca14869277406b526dfa7ca0d6b576e025

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

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

diff --git a/bin/apply-from-gmane.sh b/bin/apply-from-gmane.sh
index 0b337f2f..998574a3 100755
--- a/bin/apply-from-gmane.sh
+++ b/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