diff options
| -rwxr-xr-x | Library/Contributions/cmd/brew-pull.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb index 9cc6b478e..24294320b 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 |