Merge branch 'pb/test-parse-options-expect' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:24 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:24 +0000 (09:01 -0700)
commit020222e...4dc1c8478fd217ccc524677215674821
tree44caea5...c71e43b5e2a89037aab0ddcf241a04e7copy hash to clipboard (tree)
parent334c2a1...593fa0dfb7c0636bfcd43c31bb7b4ad1copy hash to clipboard (diff)
parent86009f3...bb0e17829f0178953729e78f69e831c6copy hash to clipboard (diff)