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