documentation fix: git difftool uses diff tools, not merge tools.
[git] / t / lib-httpd /
drwxr-xr-x   ..
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf