git-merge: minor fix for no_trivial_merge_strategies.
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: de6f0def)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign