From: Stefan Beller <sbeller@google.com>
Date: Sat, 11 Nov 2017 00:04:43 +0000 (-0800)
Subject: t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
X-Git-Tag: v2.15.2~6^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89c4ee4e74269635e69c84800ece0f8b754636f6?ds=sidebyside;hp=89c4ee4e74269635e69c84800ece0f8b754636f6

t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---