git-merge-ours: make it a builtin.
[gitweb.git] / gitweb / test /
drwxr-xr-x   parent (dest: gitweb; base: a00a42ae33708caa742d9e9fbf10692cfa42f032)
-rw-r--r-- 17 Märchen
-rw-r--r-- 31 file with spaces
-rw-r--r-- 37 file+plus+sign