Use merge-recursive in git-checkout -m (branch switching)
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: c1a4278e)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign