Honor pull.{twohead,octopus} in git-merge.
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: de811948baa689382ad191c1c95e8be51a92c4fe)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign