aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/zpython.rb
diff options
context:
space:
mode:
authorJack Nagel2014-07-05 16:34:22 -0500
committerJack Nagel2014-07-05 16:35:43 -0500
commitd27d37e455a9cf9dc53308d679bcf6eabde7720c (patch)
tree4fa01ee9f01e8bc2e1c5d54c6dd824023ab55dd5 /Library/Formula/zpython.rb
parent7940203d0401e77f038985be72cd2e9fca75d93a (diff)
downloadhomebrew-d27d37e455a9cf9dc53308d679bcf6eabde7720c.tar.bz2
brew-pull: let git-am attempt three-way merge if patch doesn't apply
Diffstat (limited to 'Library/Formula/zpython.rb')
0 files changed, 0 insertions, 0 deletions