brew-pull: allow resolution with --resolve.

1 files changed, 6 insertions, 2 deletions

diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb
index e1b3892f2..1031a2f23 100644
--- a/Library/Homebrew/cmd/pull.rb
+++ b/Library/Homebrew/cmd/pull.rb
@@ -34,8 +34,12 @@ module Homebrew
     begin
       safe_system 'git', 'am', *patch_args
     rescue ErrorDuringExecution
-      system 'git', 'am', '--abort'
-      odie 'Patch failed to apply: aborted.'
+      if ARGV.include? "--resolve"
+        odie "Patch failed to apply: try to resolve it."
+      else
+        system 'git', 'am', '--abort'
+        odie 'Patch failed to apply: aborted.'
+      end
     ensure
       patchpath.unlink
     end