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

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

Junio C Hamano committed Sep 8, 2016 at 21:35 UTC 24c88ad8d10c36f4cd2473e6199f901ac485d74e

No changes.