Merge branch 'ls/travis-p4-on-macos' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:04 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:04 +0000 (13:32 -0800)
commitaf1a71f...1646f6d32a36f0b68183c1e24d37f808
tree7b6179f...49e5872b1e276d343f25d6614125aa7fcopy hash to clipboard (tree)
parentfccb413...1f6fd00b7facf2983ff5db94d1780de7copy hash to clipboard (diff)
parent672f51c...83300d1feba8fb00b19afa3b335b2106copy hash to clipboard (diff)