mergetool: Make git-rm quiet when resolving a deleted file conflict
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: 1346c9996350e96c7b38a57ede5d503821d84fe3)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign