test that git status works with merge conflict in, .gitmodules
[gitweb.git] / t / t4034 / csharp /
drwxr-xr-x   parent (dest: t/t4034; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 2062 expect
-rw-r--r-- 266 post
-rw-r--r-- 248 pre