Merge branch 'rs/merge-recursive-string-list-init'
commit8a5ad2ba5bacd84c10ec62b0cf5a67d0f147746e
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:47:36 +0000 (12 09:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Aug 2016 16:47:36 +0000 (12 09:47 -0700)
tree01457c5fb2c0cc3ebb30966eadd138e1eb5117ba
parentb32d7c524b2a0e404c297609aea6ec1cf9f889fe
parentaf4941d444f8bbbc02f68472f4cd6d5846ee043c
Merge branch 'rs/merge-recursive-string-list-init'

A small code clean-up.

* rs/merge-recursive-string-list-init:
  merge-recursive: use STRING_LIST_INIT_NODUP
merge-recursive.c