Let merge set the default strategy.
[gitweb.git] / contrib /
drwxr-xr-x   parent (dest: ; base: c8e2db00f9622af6e5f640443dfbe63bb1af39e0)
-rw-r--r-- 2114 README
drwxr-xr-x - emacs
drwxr-xr-x - git-svn
drwxr-xr-x - gitview