Merge branch 'en/merge-octopus-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:17:15 +0000 (15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:17:15 +0000 (15:17 -0700)
commit9058b8f...43f5dd287b6587373f031d79694b6024
tree817e9ce...19da084a1a94db130c7c6eeabc3b0756copy hash to clipboard (tree)
parentedc2f71...bd2d18566045ed1e8eadd808cedd2903copy hash to clipboard (diff)
parent3ec62ad...ffba2476e30fdf8e8717756fe62119f9copy hash to clipboard (diff)