Documentation: Add definition of "evil merge" to GIT Glossary
[gitweb.git] / contrib / vim /
drwxr-xr-x   parent (dest: contrib; base: c1bab2889eb71bf537497fc77a2fdb6a74bc92e6)
-rw-r--r-- 360 README
drwxr-xr-x - syntax