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