completion: add missing options for git-merge
[git] / contrib / git-shell-commands /
drwxr-xr-x   ..
-rw-r--r-- 839 README
-rwxr-xr-x 283 help
-rwxr-xr-x 227 list