Merge branch 'rs/merge-recursive-string-list-init' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:59 +0000 (21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:59 +0000 (21:35 -0700)
commitf14883b...72f3d6b104c4d141fc3de34af9ba0b24
treef745b38...d02a707139c806197c9dd932e35853e2copy hash to clipboard (tree)
parent24c88ad...d10c36f4cd2473e6199f901ac485d74ecopy hash to clipboard (diff)
parentaf4941d...44f8bbbc02f68472f4cd6d5846ee043ccopy hash to clipboard (diff)
merge-recursive.c