git-merge documentation: describe how conflict is presented
[gitweb.git] / contrib / vim /
drwxr-xr-x   parent (dest: contrib; base: 70a3f89733a4cd21631690ba980598fea2249067)
-rw-r--r-- 360 README
drwxr-xr-x - syntax