merge-file: support -p and -q; fix compile warnings
[git] / gitweb / test /
drwxr-xr-x   ..
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign