git merge: reword failure message.
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: 0c4e95d083f77de03a64b65f5633ed0ba082a26e)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign