merge-recursive: demonstrate an incorrect conflict with submodule
[git] / t / t9153 /
drwxr-xr-x   ..
-rw-r--r-- 1002 svn.dump