Ignore merged status of the file-level merge
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: 0d5e6c9781aae33795243452fd50663d17ec2b9d)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign