t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
authorStefan Beller <sbeller@google.com>
Sat, 11 Nov 2017 00:04:43 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Nov 2017 05:47:45 +0000 (14:47 +0900)
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found