Allow git-merge to select the default strategy.
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: 6b5a795bf586aa019bbb11ffe9f2fc315ba9765e)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign