brew-pull: let git-am attempt three-way merge if patch doesn't apply

2014-07-05 16:34:22 -05:00 · 2014-07-05 16:34:22 -05:00 · 6c91c0806f
commit 6c91c0806f
parent cf4080a9e0
1 changed files with 3 additions and 0 deletions
--- 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