merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / lib-httpd /
drwxr-xr-x   ..
-rw-r--r-- 659 apache.conf
-rw-r--r-- 227 ssl.cnf