bash completion: only show 'log --merge' if merging
[git] / t / lib-httpd /
drwxr-xr-x   ..
-rw-r--r-- 732 apache.conf
-rw-r--r-- 227 ssl.cnf