Merge branch 'en/merge-recursive-tests'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2018 20:22:36 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2018 20:22:36 +0000 (13:22 -0700)
commit93b74a7...fa47b636c060b033bc7d03319f7841e2
treebe04beb...2e39b68f389c575a530576f272cb80f4copy hash to clipboard (tree)
parentac997db...c13d3acde8fcb6c79ff095ba6bd27169copy hash to clipboard (diff)
parentd43eba0...b5538bd9327b1e3c9ed00abb1c5b558dcopy hash to clipboard (diff)