Code

Provide 'git merge --abort' as a synonym to 'git reset --merge'
[git.git] / t / lib-httpd /
drwxr-xr-x   ..
-rw-r--r-- 1529 apache.conf
-rw-r--r-- 227 ssl.cnf