t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
[git] / t / t9604 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot