Merge branch 'rs/merge-recursive-string-list-init'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:47:36 +0000 (09:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:47:36 +0000 (09:47 -0700)
commit8a5ad2b...5bacd84c10ec62b0cf5a67d0f147746e
tree01457c5...b2c0cc3ebb30966eadd138e1eb5117bacopy hash to clipboard (tree)
parentb32d7c5...4b2a0e404c297609aea6ec1cf9f889fecopy hash to clipboard (diff)
parentaf4941d...44f8bbbc02f68472f4cd6d5846ee043ccopy hash to clipboard (diff)
merge-recursive.c