Merge branch 'rs/merge-add-strategies-simplification'

A small code clean-up. * rs/merge-add-strategies-simplification: merge: use string_list_split() in add_strategies()

Junio C Hamano committed Aug 12, 2016 at 09:47 UTC b32d7c524b2a0e404c297609aea6ec1cf9f889fe

No changes.