merge-recursive: demonstrate an incorrect conflict with submodule
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: 7d82b06d2be1b872a1debf79fadf0585afc70b69)
-rwxr-xr-x 1889 git-new-workdir