diff options
| author | Jack Nagel | 2014-07-05 16:34:22 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-05 16:35:43 -0500 |
| commit | 6c91c0806f6295ed9aa650e2cfc298aa864d886b (patch) | |
| tree | bfc1086804aa6ea5ed29f763abeb09956e43c650 | |
| parent | cf4080a9e0517efc16a71b686e80c3ebcc38f5a2 (diff) | |
| download | brew-6c91c0806f6295ed9aa650e2cfc298aa864d886b.tar.bz2 | |
brew-pull: let git-am attempt three-way merge if patch doesn't apply
| -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 |