From 6c91c0806f6295ed9aa650e2cfc298aa864d886b Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sat, 5 Jul 2014 16:34:22 -0500
Subject: [PATCH] brew-pull: let git-am attempt three-way merge if patch
 doesn't apply

---
 Library/Contributions/cmd/brew-pull.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb
index 9cc6b478e4..24294320b8 100755
--- a/Library/Contributions/cmd/brew-pull.rb
+++ b/Library/Contributions/cmd/brew-pull.rb
@@ -66,6 +66,9 @@ ARGV.named.each do |arg|
   else
     patch_args << '--whitespace=fix'
   end
+
+  # Fall back to three-way merge if patch does not apply cleanly
+  patch_args << "-3"
   patch_args << patchpath
 
   begin