Merge branch 'nd/list-merge-strategy' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:11 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:11 +0000 (14:24 -0700)
commit091853a...aad7e337ac24a55c466820db41ad1026
treed32cd78...8411b771f3c16cfa01add96beede05a1copy hash to clipboard (tree)
parentf936c9b...9339983a3cc270803fb9bc0d621da553copy hash to clipboard (diff)
parent7cc763a...a3f39c62e0b2d5520e9d2bd8e4f3c4b3copy hash to clipboard (diff)