admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source
This commit is contained in:
Jack Nagel 2014-07-05 16:34:22 -05:00
parent cf4080a9e0
commit 6c91c0806f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Contributions/cmd/brew-pull.rb
View File

@ -66,6 +66,9 @@ ARGV.named.each do |arg|
else else
patch_args << '--whitespace=fix' patch_args << '--whitespace=fix'
end end
# Fall back to three-way merge if patch does not apply cleanly
patch_args << "-3"
patch_args << patchpath patch_args << patchpath
begin begin