From a98fbeca14869277406b526dfa7ca0d6b576e025 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 12 Jun 2013 15:40:02 -0500
Subject: [PATCH] apply-from-gmane: fall back to three-way merges

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 bin/apply-from-gmane.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.11.4.GIT