From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Aug 2016 16:47:36 +0000 (-0700)
Subject: Merge branch 'rs/merge-add-strategies-simplification'
X-Git-Tag: v2.10.0-rc0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b32d7c524b2a0e404c297609aea6ec1cf9f889fe;p=thirdparty%2Fgit.git

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()
---

b32d7c524b2a0e404c297609aea6ec1cf9f889fe