git-merge: add support for --commit and --no-squash
[git] / contrib / vim /
drwxr-xr-x   ..
-rw-r--r-- 360 README
drwxr-xr-x - syntax