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)
commitf14883b972f3d6b104c4d141fc3de34af9ba0b24
treef745b382d02a707139c806197c9dd932e35853e2
parent24c88ad8d10c36f4cd2473e6199f901ac485d74e
parentaf4941d444f8bbbc02f68472f4cd6d5846ee043c
Merge branch 'rs/merge-recursive-string-list-init' into maint

A small code clean-up.

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