test that git status works with merge conflict in, .gitmodules
[gitweb.git] / t / t9602 / cvsroot / module / sub3 /
drwxr-xr-x   parent (dest: t/t9602/cvsroot/module; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 1579 default,v