Merge branch 'en/merge-fixes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)
commit10b8084...e1be90227dff570fee8a57d183e7ae07
tree0f9ec14...26b2bb775183faa7fc479b2c17a9c00ecopy hash to clipboard (tree)
parentee88674...24151fe5c6cd6ccd3c1a6cd972b2adc0copy hash to clipboard (diff)
parent8e1b62f...74bb53f5fb7cf027f9c426d0c6864003copy hash to clipboard (diff)