From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Sep 2016 04:35:58 +0000 (-0700)
Subject: Merge branch 'rs/merge-add-strategies-simplification' into maint
X-Git-Tag: v2.10.1~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24c88ad8d10c36f4cd2473e6199f901ac485d74e;p=thirdparty%2Fgit.git

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

24c88ad8d10c36f4cd2473e6199f901ac485d74e