test that git status works with merge conflict in, .gitmodules
[gitweb.git] / t / t9136 /
drwxr-xr-x   parent (dest: t; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 2221 svn.dump