From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Nov 2017 02:06:34 +0000 (+0900)
Subject: Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'
X-Git-Tag: v2.16.0-rc0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f70a50fc48e4f3e00120153c68df1acd2a5aa382;p=thirdparty%2Fgit.git

Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'

The three-way merge performed by "git cherry-pick" was confused
when a new submodule was added in the meantime, which has been
fixed (or "papered over").

* sb/test-cherry-pick-submodule-getting-in-a-way:
  merge-recursive: handle addition of submodule on our side of history
  t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
---

f70a50fc48e4f3e00120153c68df1acd2a5aa382