git-merge: add support for --commit and --no-squash
[git] / contrib / patches /
drwxr-xr-x   ..
-rw-r--r-- 883 docbook-xsl-manpages-charmap.patch