merge-recursive: demonstrate an incorrect conflict with submodule
[git] / t / t9601 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot