From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:09:03 +0000 (-0800)
Subject: Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint
X-Git-Tag: v2.15.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2ace172f95f4afdc565bbcbc2373ebf33b8a9371

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

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

2ace172f95f4afdc565bbcbc2373ebf33b8a9371