merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / contrib / patches /
drwxr-xr-x   parent (dest: contrib; base: b541248)
-rw-r--r-- 883 docbook-xsl-manpages-charmap.patch