merge-recursive: demonstrate an incorrect conflict with submodule
[git] / t / t4020 /
drwxr-xr-x   ..
-rw-r--r-- 116 diff.NUL