merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / contrib / patches /
drwxr-xr-x   ..
-rw-r--r-- 883 docbook-xsl-manpages-charmap.patch