diff options
| author | Jack Nagel | 2014-07-05 16:34:22 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-05 16:35:43 -0500 |
| commit | d27d37e455a9cf9dc53308d679bcf6eabde7720c (patch) | |
| tree | 4fa01ee9f01e8bc2e1c5d54c6dd824023ab55dd5 /Library | |
| parent | 7940203d0401e77f038985be72cd2e9fca75d93a (diff) | |
| download | homebrew-d27d37e455a9cf9dc53308d679bcf6eabde7720c.tar.bz2 | |
brew-pull: let git-am attempt three-way merge if patch doesn't apply
Diffstat (limited to 'Library')
| -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 |