git-merge-recursive: honor merge.conflictstyle once again
[gitweb.git] / contrib / patches /
drwxr-xr-x   parent (dest: contrib; base: e137a892d88cc40d7c0df45c06c08d144f7b3ce2)
-rw-r--r-- 883 docbook-xsl-manpages-charmap.patch