test that git status works with merge conflict in, .gitmodules
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 63 add-signed-off
-rwxr-xr-x 77 edit-content