Merge branches 'lt/crlf' and 'jc/apply-config'
[gitweb.git] / contrib / examples /
drwxr-xr-x   parent (dest: contrib; base: ef1a5c2fa8bc67abea6cbacf975ea3260cd40fa3)
-rwxr-xr-x 2715 git-resolve.sh