merge-recursive: demonstrate an incorrect conflict with submodule
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 4627 test.pl