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)
commit89c4ee4...74269635e69c84800ece0f8b754636f6
tree45ded2d...5419d8a355d39d299648b4ee8cc196e0copy hash to clipboard (tree)
parentcb5918a...0d50f50e83787f65c2ddc3dcb10159fecopy hash to clipboard (diff)
t/t3512-cherry-pick-submodule.sh