Let merge set the default strategy.
[gitweb.git] / contrib / gitview /
drwxr-xr-x   parent (dest: contrib; base: c8e2db00f9622af6e5f640443dfbe63bb1af39e0)
-rwxr-xr-x 28736 gitview
-rw-r--r-- 686 gitview.txt