test that git status works with merge conflict in, .gitmodules
[gitweb.git] / t / t9603 / cvsroot / module /
drwxr-xr-x   parent (dest: t/t9603/cvsroot; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 589 a,v
-rw-r--r-- 703 b,v