Keep rename/rename conflicts of intermediate merges while doing recursive merge
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: a97e4075a16e0cbdf9c4aed736b5e762e035508b)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign