git-merge: minor fix for no_trivial_merge_strategies.
[gitweb.git] / contrib / vim /
drwxr-xr-x   parent (dest: contrib; base: de6f0def)
-rw-r--r-- 360 README
drwxr-xr-x - syntax